From e169df5d8888b31c02743f0b3a8db25afde46572 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 5 Sep 2022 15:30:56 +0100 Subject: [PATCH] Fix backwards masking of SECONDARY_COMMAND_BUFFERS_BIT in dyn rendering --- renderdoc/driver/vulkan/vk_core.cpp | 2 +- renderdoc/driver/vulkan/vk_overlay.cpp | 2 +- renderdoc/driver/vulkan/vk_postvs.cpp | 2 +- renderdoc/driver/vulkan/vk_shader_feedback.cpp | 2 +- renderdoc/driver/vulkan/vk_shaderdebug.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp index a82c79661..e6b9dedd8 100644 --- a/renderdoc/driver/vulkan/vk_core.cpp +++ b/renderdoc/driver/vulkan/vk_core.cpp @@ -3844,7 +3844,7 @@ void WrappedVulkan::ReplayLog(uint32_t startEventID, uint32_t endEventID, Replay VkSubpassContents subpassContents = m_RenderState.subpassContents; VkRenderingFlags dynamicFlags = m_RenderState.dynamicRendering.flags; m_RenderState.subpassContents = VK_SUBPASS_CONTENTS_INLINE; - m_RenderState.dynamicRendering.flags &= VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; + m_RenderState.dynamicRendering.flags &= ~VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; rpWasActive = m_Partial[Primary].renderPassActive; diff --git a/renderdoc/driver/vulkan/vk_overlay.cpp b/renderdoc/driver/vulkan/vk_overlay.cpp index 5d6c8bce2..7dbb4d1fb 100644 --- a/renderdoc/driver/vulkan/vk_overlay.cpp +++ b/renderdoc/driver/vulkan/vk_overlay.cpp @@ -1000,7 +1000,7 @@ ResourceId VulkanReplay::RenderOverlay(ResourceId texid, FloatVector clearCol, D state.SetFramebuffer(m_pDriver, GetResID(m_Overlay.NoDepthFB)); state.subpassContents = VK_SUBPASS_CONTENTS_INLINE; - state.dynamicRendering.flags &= VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; + state.dynamicRendering.flags &= ~VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; state.graphics.pipeline = GetResID(pipe); diff --git a/renderdoc/driver/vulkan/vk_postvs.cpp b/renderdoc/driver/vulkan/vk_postvs.cpp index d554c0c50..0bc2b5247 100644 --- a/renderdoc/driver/vulkan/vk_postvs.cpp +++ b/renderdoc/driver/vulkan/vk_postvs.cpp @@ -3077,7 +3077,7 @@ void VulkanReplay::FetchTessGSOut(uint32_t eventId, VulkanRenderState &state) state.xfbcounters.clear(); state.subpassContents = VK_SUBPASS_CONTENTS_INLINE; - state.dynamicRendering.flags &= VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; + state.dynamicRendering.flags &= ~VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; if(m_PostVS.XFBQueryPoolSize < action->numInstances) { diff --git a/renderdoc/driver/vulkan/vk_shader_feedback.cpp b/renderdoc/driver/vulkan/vk_shader_feedback.cpp index 290601af1..88f49d9a0 100644 --- a/renderdoc/driver/vulkan/vk_shader_feedback.cpp +++ b/renderdoc/driver/vulkan/vk_shader_feedback.cpp @@ -1755,7 +1755,7 @@ void VulkanReplay::FetchShaderFeedback(uint32_t eventId) } modifiedstate.subpassContents = VK_SUBPASS_CONTENTS_INLINE; - modifiedstate.dynamicRendering.flags &= VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; + modifiedstate.dynamicRendering.flags &= ~VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; { VkCommandBuffer cmd = m_pDriver->GetNextCmd(); diff --git a/renderdoc/driver/vulkan/vk_shaderdebug.cpp b/renderdoc/driver/vulkan/vk_shaderdebug.cpp index c24fb3232..320d8dcca 100644 --- a/renderdoc/driver/vulkan/vk_shaderdebug.cpp +++ b/renderdoc/driver/vulkan/vk_shaderdebug.cpp @@ -4479,7 +4479,7 @@ ShaderDebugTrace *VulkanReplay::DebugPixel(uint32_t eventId, uint32_t x, uint32_ } modifiedstate.subpassContents = VK_SUBPASS_CONTENTS_INLINE; - modifiedstate.dynamicRendering.flags &= VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; + modifiedstate.dynamicRendering.flags &= ~VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; { VkCommandBuffer cmd = m_pDriver->GetNextCmd();