From 2ef5b469ea205d036ca390c739d98bde3e9d25dd Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 7 Nov 2016 20:14:37 +0100 Subject: [PATCH] Fix VS2015 variable shadowing warnings --- renderdoc/driver/vulkan/vk_initstate.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_initstate.cpp b/renderdoc/driver/vulkan/vk_initstate.cpp index 0657d8134..4d3773758 100644 --- a/renderdoc/driver/vulkan/vk_initstate.cpp +++ b/renderdoc/driver/vulkan/vk_initstate.cpp @@ -1241,8 +1241,6 @@ bool WrappedVulkan::Prepare_InitialState(WrappedVkRes *res) region.bufferOffset = bufOffset; - VkFormat sizeFormat = GetDepthOnlyFormat(layout->format); - bufOffset += GetByteSize(layout->extent.width, layout->extent.height, layout->extent.depth, sizeFormat, m); @@ -1737,14 +1735,10 @@ bool WrappedVulkan::Serialise_InitialState(ResourceId resid, WrappedVkRes *) GetResourceManager()->WrapResource(Unwrap(d), arrayIm); - VkMemoryRequirements mrq = {0}; - ObjDisp(d)->GetImageMemoryRequirements(Unwrap(d), Unwrap(arrayIm), &mrq); - VkMemoryAllocateInfo allocInfo = { - VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO, NULL, mrq.size, - GetGPULocalMemoryIndex(mrq.memoryTypeBits), - }; + allocInfo.allocationSize = mrq.size; + allocInfo.memoryTypeIndex = GetGPULocalMemoryIndex(mrq.memoryTypeBits); VkDeviceMemory arrayMem;