From e04dc8897f0be8e820081a5ff606bc4dca32fb5a Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 19 Jul 2016 21:00:58 +0200 Subject: [PATCH] Fix VS2015 warning about variable shadowing --- renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp index a7888ceee..6848bff6d 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp @@ -2103,11 +2103,11 @@ bool WrappedVulkan::Serialise_vkCmdExecuteCommands(Serialiser *localSerialiser, ToStr::Get(cmdids[c]).c_str()); // add a fake marker - FetchDrawcall draw; - draw.name = name; - draw.flags = eDraw_PassBoundary | eDraw_BeginPass; + FetchDrawcall marker; + marker.name = name; + marker.flags = eDraw_PassBoundary | eDraw_BeginPass; AddEvent(SET_MARKER, name); - AddDrawcall(draw, true); + AddDrawcall(marker, true); parentCmdBufInfo.curEventID++; BakedCmdBufferInfo &cmdBufInfo = m_BakedCmdBufferInfo[cmdids[c]]; @@ -2133,10 +2133,10 @@ bool WrappedVulkan::Serialise_vkCmdExecuteCommands(Serialiser *localSerialiser, name = StringFormat::Fmt("=> vkCmdExecuteCommands()[%u]: vkEndCommandBuffer(%s)", c, ToStr::Get(cmdids[c]).c_str()); - draw.name = name; - draw.flags = eDraw_PassBoundary | eDraw_EndPass; + marker.name = name; + marker.flags = eDraw_PassBoundary | eDraw_EndPass; AddEvent(SET_MARKER, name); - AddDrawcall(draw, true); + AddDrawcall(marker, true); parentCmdBufInfo.curEventID++; }