From da62c0a87f72ec54701ac0d456e4c8c867a60f5a Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 24 Sep 2015 13:25:47 +0200 Subject: [PATCH] Fix comparisons against swapbuffer ID to be consistently using orig IDs --- renderdoc/driver/vulkan/vk_replay.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 09fc9728d..898d56c41 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -1170,20 +1170,20 @@ FetchTexture VulkanReplay::GetTexture(ResourceId id) // VKTODOMED this should be fleshed out FetchTexture ret; + ret.ID = m_pDriver->GetResourceManager()->GetOriginalID(id); ret.arraysize = iminfo.arraySize; ret.byteSize = iminfo.extent.width*iminfo.extent.height*4; // VKTODOMED calculate proper byte size - ret.creationFlags = (id == resid ? eTextureCreate_SwapBuffer : 0)|eTextureCreate_SRV|eTextureCreate_RTV; + ret.creationFlags = (ret.ID == resid ? eTextureCreate_SwapBuffer : 0)|eTextureCreate_SRV|eTextureCreate_RTV; ret.cubemap = false; ret.customName = false; ret.width = iminfo.extent.width; ret.height = iminfo.extent.height; ret.depth = iminfo.extent.depth; ret.dimension = 2; - ret.ID = m_pDriver->GetResourceManager()->GetOriginalID(id); ret.mips = iminfo.mipLevels; ret.msQual = 0; ret.msSamp = 1; - ret.name = (id == resid ? "WSI Presentable Image" : StringFormat::Fmt("Image %llu", ret.ID)); + ret.name = (ret.ID == resid ? "WSI Presentable Image" : StringFormat::Fmt("Image %llu", ret.ID)); ret.numSubresources = 1; ret.format = MakeResourceFormat(iminfo.format); return ret;