From e2f9cffb3d824e9b84f8a6f599a38e3b46767203 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 4 Dec 2015 10:30:45 +0100 Subject: [PATCH] Fix recording image barriers from non-baked command info --- renderdoc/driver/vulkan/vk_manager.cpp | 1 - renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp index a731ce544..33230a6df 100644 --- a/renderdoc/driver/vulkan/vk_manager.cpp +++ b/renderdoc/driver/vulkan/vk_manager.cpp @@ -241,7 +241,6 @@ void VulkanResourceManager::SerialiseImageStates(map & ResourceId liveid; if(m_State < WRITING && HasLiveResource(id)) liveid = GetLiveID(id); - auto dstit = states.find(id); for(uint32_t m=0; m < NumStates; m++) { diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp index 3502e9713..fac2214c8 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp @@ -359,7 +359,7 @@ VkResult WrappedVulkan::vkQueueSubmit( { SCOPED_LOCK(m_ImageLayoutsLock); - GetResourceManager()->ApplyBarriers(record->cmdInfo->imgbarriers, m_ImageLayouts); + GetResourceManager()->ApplyBarriers(record->bakedCommands->cmdInfo->imgbarriers, m_ImageLayouts); } // need to lock the whole section of code, not just the check on