Module: Mesa Branch: staging/23.0 Commit: fe2f5e6b7609bc7b18a4309c312ce8a96e765776 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fe2f5e6b7609bc7b18a4309c312ce8a96e765776
Author: Samuel Pitoiset <[email protected]> Date: Mon Feb 27 10:45:08 2023 +0100 radv: fix flushing non-coherent images inside secondaries on GFX9+ Fixes dEQP-VK.draw.dynamic_rendering.complete_secondary_cmd_buff.multi_draw.mosaic.* on VEGA10 (related to the use of HTILE). Cc: mesa-stable Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21549> (cherry picked from commit 6750a9094f632567534a2cbdd71ff23944647667) --- .pick_status.json | 2 +- src/amd/vulkan/radv_cmd_buffer.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 3db2592bc26..8f82a24215a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -76,7 +76,7 @@ "description": "radv: fix flushing non-coherent images inside secondaries on GFX9+", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 0644bc08ce6..92f5fd3e26b 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -7149,6 +7149,8 @@ radv_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCou primary->state.last_vrs_rates_sgpr_idx = secondary->state.last_vrs_rates_sgpr_idx; primary->state.last_pa_sc_binner_cntl_0 = secondary->state.last_pa_sc_binner_cntl_0; + + primary->state.rb_noncoherent_dirty |= secondary->state.rb_noncoherent_dirty; } /* After executing commands from secondary buffers we have to dirty
