Fix VS2015 variable shadowing warnings

This commit is contained in:
baldurk
2016-11-07 20:14:37 +01:00
parent 4304b626ad
commit 2ef5b469ea
+2 -8
View File
@@ -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;