ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vulkan: Fix bug where command buffer wouldn't be started after resize

This commit is contained in:
Stenzek 2017-09-16 15:52:12 +10:00
parent 1a4883ac5a
commit 80593f502e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/VideoBackends/Vulkan/Renderer.cpp
View File

@ -325,10 +325,6 @@ void Renderer::BeginFrame()
// Activate a new command list, and restore state ready for the next draw // Activate a new command list, and restore state ready for the next draw
g_command_buffer_mgr->ActivateCommandBuffer(); g_command_buffer_mgr->ActivateCommandBuffer();
// Restore the EFB color texture to color attachment ready for rendering the next frame.
FramebufferManager::GetInstance()->GetEFBColorTexture()->TransitionToLayout(
g_command_buffer_mgr->GetCurrentCommandBuffer(), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
// Ensure that the state tracker rebinds everything, and allocates a new set // Ensure that the state tracker rebinds everything, and allocates a new set
// of descriptors out of the next pool. // of descriptors out of the next pool.
StateTracker::GetInstance()->InvalidateDescriptorSets(); StateTracker::GetInstance()->InvalidateDescriptorSets();
@ -575,6 +571,10 @@ void Renderer::SwapImpl(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height
// Prep for the next frame (get command buffer ready) before doing anything else. // Prep for the next frame (get command buffer ready) before doing anything else.
BeginFrame(); BeginFrame();
// Restore the EFB color texture to color attachment ready for rendering the next frame.
FramebufferManager::GetInstance()->GetEFBColorTexture()->TransitionToLayout(
g_command_buffer_mgr->GetCurrentCommandBuffer(), VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
// Determine what (if anything) has changed in the config. // Determine what (if anything) has changed in the config.
CheckForConfigChanges(); CheckForConfigChanges();
@ -730,6 +730,7 @@ void Renderer::DrawScreen(const TargetRectangle& scaled_efb_rect, u32 xfb_addr,
// PrepareToSubmitCommandBuffer to return to the state that the caller expects. // PrepareToSubmitCommandBuffer to return to the state that the caller expects.
g_command_buffer_mgr->SubmitCommandBuffer(false); g_command_buffer_mgr->SubmitCommandBuffer(false);
ResizeSwapChain(); ResizeSwapChain();
BeginFrame();
g_command_buffer_mgr->PrepareToSubmitCommandBuffer(); g_command_buffer_mgr->PrepareToSubmitCommandBuffer();
res = m_swap_chain->AcquireNextImage(m_image_available_semaphore); res = m_swap_chain->AcquireNextImage(m_image_available_semaphore);
} }