From 3bba4a9a1858cc0fa4a85cef10ed5500b9aea3bb Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Mon, 3 Oct 2016 16:01:12 -0600 Subject: layers: Clean up Windows build warnings Change-Id: Iec47464d56c862cb1a6f132241d200d6f68efa21 --- layers/core_validation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'layers/core_validation.cpp') diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index afc0e3a0..3768a881 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -5237,7 +5237,7 @@ static void initializeAndTrackMemory(layer_data *dev_data, VkDeviceMemory mem, V // From spec: (ppData - offset) must be aligned to at least limits::minMemoryMapAlignment. uint64_t start_offset = offset % map_alignment; // Data passed to driver will be wrapped by a guardband of data to detect over- or under-writes. - mem_info->shadow_copy_base = malloc(2 * mem_info->shadow_pad_size + size + map_alignment + start_offset); + mem_info->shadow_copy_base = malloc(static_cast(2 * mem_info->shadow_pad_size + size + map_alignment + start_offset)); mem_info->shadow_copy = reinterpret_cast((reinterpret_cast(mem_info->shadow_copy_base) + map_alignment) & @@ -5245,7 +5245,7 @@ static void initializeAndTrackMemory(layer_data *dev_data, VkDeviceMemory mem, V assert(vk_safe_modulo(reinterpret_cast(mem_info->shadow_copy) + mem_info->shadow_pad_size - start_offset, map_alignment) == 0); - memset(mem_info->shadow_copy, NoncoherentMemoryFillValue, 2 * mem_info->shadow_pad_size + size); + memset(mem_info->shadow_copy, NoncoherentMemoryFillValue, static_cast(2 * mem_info->shadow_pad_size + size)); *ppData = static_cast(mem_info->shadow_copy) + mem_info->shadow_pad_size; } } @@ -10194,7 +10194,7 @@ CmdBeginRenderPass(VkCommandBuffer commandBuffer, const VkRenderPassBeginInfo *p if (renderPass) { uint32_t clear_op_size = 0; // Make sure pClearValues is at least as large as last LOAD_OP_CLEAR cb_node->activeFramebuffer = pRenderPassBegin->framebuffer; - for (size_t i = 0; i < renderPass->createInfo.attachmentCount; ++i) { + for (uint32_t i = 0; i < renderPass->createInfo.attachmentCount; ++i) { MT_FB_ATTACHMENT_INFO &fb_info = framebuffer->attachments[i]; auto pAttachment = &renderPass->createInfo.pAttachments[i]; if (FormatSpecificLoadAndStoreOpSettings(pAttachment->format, pAttachment->loadOp, -- cgit v1.2.3