From 89176fe2aba3b01d87761acb53795127e6449fc2 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 14 Nov 2016 20:19:59 +1000 Subject: [PATCH 1/2] Vulkan: Fix crash on EFB poke --- Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp index c3fc47cb5e..4210fb3b8b 100644 --- a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp @@ -103,6 +103,12 @@ bool FramebufferManager::Initialize() return false; } + if (!CompilePokeShaders()) + { + PanicAlert("Failed to compile poke shaders"); + return false; + } + return true; } From bd67adb36200d0453768177c63498c7c6f53ce96 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 14 Nov 2016 20:24:16 +1000 Subject: [PATCH 2/2] Vulkan: Use correct sample count for EFB pokes with MSAA enabled --- Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp index 4210fb3b8b..17dc9253cd 100644 --- a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp @@ -1181,6 +1181,7 @@ void FramebufferManager::DrawPokeVertices(const EFBPokeVertex* vertices, size_t pipeline_info.ps = m_poke_fragment_shader; pipeline_info.render_pass = m_efb_load_render_pass; pipeline_info.rasterization_state.bits = Util::GetNoCullRasterizationState().bits; + pipeline_info.rasterization_state.samples = m_efb_samples; pipeline_info.depth_stencil_state.bits = Util::GetNoDepthTestingDepthStencilState().bits; pipeline_info.blend_state.bits = Util::GetNoBlendingBlendState().bits; pipeline_info.blend_state.write_mask = 0;