mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 13:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk: Fix nul deref in spill code

Browse Source 
- Restores code lost in a rebase
This commit is contained in:
kd-11 2021-07-17 00:22:25 +03:00 committed by kd-11
parent b7df539871
commit 2d4df57d87
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpcs3/Emu/RSX/VK/VKRenderTargets.cpp
View File

@ -540,7 +540,7 @@ namespace vk
break;
}
vk::image* src = nullptr;
vk::viewable_image* src = nullptr;
if (samples() == 1) [[likely]]
{
src = this;
@ -588,7 +588,24 @@ namespace vk
if (msaa_flags & rsx::surface_state_flags::require_resolve)
{
ensure(samples() > 1);
const bool borrowed = [&]()
{
if (src != resolve_surface.get())
{
ensure(!resolve_surface);
resolve_surface.reset(src);
return true;
}
return false;
}();
resolve(cmd);
if (borrowed)
{
resolve_surface.release();
}
}
const auto pdev = vk::get_current_renderer();