diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2023-02-27 10:45:08 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-03-08 18:00:13 +0000 |
| commit | e4ffd343abc3c266122cc26e1e3624e940cfd4d9 (patch) | |
| tree | d3f2eb5f2c9ce77529a8147307c9e99ab96a30e6 | |
| parent | c18f920e5d0828987cde9d6949bf9c767387a589 (diff) | |
| download | mesa-e4ffd343abc3c266122cc26e1e3624e940cfd4d9.tar.gz | |
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 <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21549>
(cherry picked from commit 6750a9094f632567534a2cbdd71ff23944647667)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json index 410946337cd..d304994c412 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4279,7 +4279,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 8f634752a90..6e47c467e28 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -6300,6 +6300,8 @@ radv_CmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCou primary->state.last_vrs_rates = secondary->state.last_vrs_rates; primary->state.last_vrs_rates_sgpr_idx = secondary->state.last_vrs_rates_sgpr_idx; + + primary->state.rb_noncoherent_dirty |= secondary->state.rb_noncoherent_dirty; } /* After executing commands from secondary buffers we have to dirty |