From 880f7388230d1c297acac848a267f649e0510a7b Mon Sep 17 00:00:00 2001 From: Friedrich Vock Date: Sat, 10 Jun 2023 22:01:46 +0200 Subject: [PATCH] radv: Always flush before writing acceleration structure properties Equivalent of 284e604872 but for acceleration structure queries. If an app inserts a barrier between AS builds and writing AS properties, we must respect it or things will blow up. Cc: mesa-stable Reviewed-by: Konstantin Seurer Part-of: (cherry picked from commit 4181e144eff4dae4b84821e2a8b195d16ad393d6) --- .pick_status.json | 2 +- src/amd/vulkan/radv_query.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3d2f0426a99..9a1d0de480f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2488,7 +2488,7 @@ "description": "radv: Always flush before writing acceleration structure properties", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c index 5be9a0e1716..abea2590e65 100644 --- a/src/amd/vulkan/radv_query.c +++ b/src/amd/vulkan/radv_query.c @@ -2213,7 +2213,7 @@ radv_CmdWriteAccelerationStructuresPropertiesKHR( radv_cs_add_buffer(cmd_buffer->device->ws, cs, pool->bo); - emit_query_flush(cmd_buffer, pool); + si_emit_cache_flush(cmd_buffer); ASSERTED unsigned cdw_max = radeon_check_space(cmd_buffer->device->ws, cs, 6 * accelerationStructureCount);