archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk: Fix bug that made fall-out barriers never get triggered

Browse source
This commit is contained in:
kd-11 2022-12-28 17:14:39 +03:00 • committed by kd-11
parent b13165f95a
commit 9d432187aa
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rpcs3/Emu/RSX/VK/VKRenderTargets.cpp
View file

@ -803,7 +803,7 @@ namespace vk
const auto optimal_layout = supports_fbo_loops ? VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT const auto optimal_layout = supports_fbo_loops ? VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT
: VK_IMAGE_LAYOUT_GENERAL; : VK_IMAGE_LAYOUT_GENERAL;
if (is_framebuffer_read_only && current_layout == optimal_layout && m_cyclic_ref_tracker.can_skip()) if (m_cyclic_ref_tracker.can_skip() && current_layout == optimal_layout && is_framebuffer_read_only)
{ {
// If we have back-to-back depth-read barriers, skip subsequent ones // If we have back-to-back depth-read barriers, skip subsequent ones
// If an actual write is happening, this flag will be automatically reset // If an actual write is happening, this flag will be automatically reset
@ -824,7 +824,7 @@ namespace vk
// This is a fall-out barrier after a cyclic ref when the same surface is still bound. // This is a fall-out barrier after a cyclic ref when the same surface is still bound.
// In this case, we're just checking that the previous read completes before the next write. // In this case, we're just checking that the previous read completes before the next write.
const bool is_framebuffer_read_only = is_depth_surface() && !rsx::method_registers.depth_write_enabled(); const bool is_framebuffer_read_only = is_depth_surface() && !rsx::method_registers.depth_write_enabled();
if (is_framebuffer_read_only && m_cyclic_ref_tracker.can_skip()) if (m_cyclic_ref_tracker.can_skip() && is_framebuffer_read_only)
{ {
// Barrier ellided if triggered by a chain of cyclic references with no actual writes // Barrier ellided if triggered by a chain of cyclic references with no actual writes
m_cyclic_ref_tracker.reset(); m_cyclic_ref_tracker.reset();

2
rpcs3/Emu/RSX/VK/VKRenderTargets.h
View file

@ -40,7 +40,7 @@ namespace vk
void on_insert_draw_barrier() void on_insert_draw_barrier()
{ {
// Account for corner case where the same texture can be bound to more than 1 slot // Account for corner case where the same texture can be bound to more than 1 slot
m_draw_barrier_count = m_texture_barrier_count; m_draw_barrier_count = std::max(m_draw_barrier_count + 1, m_texture_barrier_count);
} }
void allow_skip() void allow_skip()