From cbe7a2ad8e99f1b66716f3aa1d561a9a498acd45 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 30 Aug 2015 22:44:30 +0200 Subject: [PATCH] Ensure 1:1 BindOutputWindow to FlipOutputWindow, for now * Later FlipOutputWindow will probably acquire then present, but atm Bind acquires and Flip presents. --- renderdoc/driver/vulkan/vk_replay.cpp | 4 ++-- renderdoc/replay/replay_output.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_replay.cpp b/renderdoc/driver/vulkan/vk_replay.cpp index 9385ac733..6fa030c83 100644 --- a/renderdoc/driver/vulkan/vk_replay.cpp +++ b/renderdoc/driver/vulkan/vk_replay.cpp @@ -395,12 +395,12 @@ void VulkanReplay::ClearOutputWindowDepth(uint64_t id, float depth, uint8_t sten void VulkanReplay::FlipOutputWindow(uint64_t id) { - VULKANNOTIMP("FlipOutputWindow"); - auto it = m_OutputWindows.find(id); if(id == 0 || it == m_OutputWindows.end()) return; + VULKANNOTIMP("FlipOutputWindow"); + OutputWindow &outw = it->second; VkDevice dev = m_pDriver->GetDev(); diff --git a/renderdoc/replay/replay_output.cpp b/renderdoc/replay/replay_output.cpp index d6a05ebd1..09e8fe0a2 100644 --- a/renderdoc/replay/replay_output.cpp +++ b/renderdoc/replay/replay_output.cpp @@ -415,6 +415,7 @@ bool ReplayOutput::Display() { if(!m_Thumbnails[i].dirty) { + m_pDevice->BindOutputWindow(m_Thumbnails[i].outputID, false); m_pDevice->FlipOutputWindow(m_Thumbnails[i].outputID); continue; } @@ -470,7 +471,9 @@ bool ReplayOutput::Display() if(!m_MainOutput.dirty) { + m_pDevice->BindOutputWindow(m_MainOutput.outputID, false); m_pDevice->FlipOutputWindow(m_MainOutput.outputID); + m_pDevice->BindOutputWindow(m_PixelContext.outputID, false); m_pDevice->FlipOutputWindow(m_PixelContext.outputID); return true; }