From 13ad10bd263262fd43bef4217ec09fd3d6f3d20e Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 25 Mar 2024 13:45:51 +0100
Subject: [PATCH] radv/rmv: fix logging of per-queue destroyed BOs

They should be logged before actually destroyed.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28367>
---
 src/amd/vulkan/radv_queue.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c
index 1d5f1cf38d7..80bab7836a2 100644
--- a/src/amd/vulkan/radv_queue.c
+++ b/src/amd/vulkan/radv_queue.c
@@ -1088,32 +1088,32 @@ radv_update_preamble_cs(struct radv_queue_state *queue, struct radv_device *devi
 
    if (scratch_bo != queue->scratch_bo) {
       if (queue->scratch_bo) {
-         ws->buffer_destroy(ws, queue->scratch_bo);
          radv_rmv_log_command_buffer_bo_destroy(device, queue->scratch_bo);
+         ws->buffer_destroy(ws, queue->scratch_bo);
       }
       queue->scratch_bo = scratch_bo;
    }
 
    if (compute_scratch_bo != queue->compute_scratch_bo) {
       if (queue->compute_scratch_bo) {
-         ws->buffer_destroy(ws, queue->compute_scratch_bo);
          radv_rmv_log_command_buffer_bo_destroy(device, queue->compute_scratch_bo);
+         ws->buffer_destroy(ws, queue->compute_scratch_bo);
       }
       queue->compute_scratch_bo = compute_scratch_bo;
    }
 
    if (esgs_ring_bo != queue->esgs_ring_bo) {
       if (queue->esgs_ring_bo) {
-         ws->buffer_destroy(ws, queue->esgs_ring_bo);
          radv_rmv_log_command_buffer_bo_destroy(device, queue->esgs_ring_bo);
+         ws->buffer_destroy(ws, queue->esgs_ring_bo);
       }
       queue->esgs_ring_bo = esgs_ring_bo;
    }
 
    if (gsvs_ring_bo != queue->gsvs_ring_bo) {
       if (queue->gsvs_ring_bo) {
-         ws->buffer_destroy(ws, queue->gsvs_ring_bo);
          radv_rmv_log_command_buffer_bo_destroy(device, queue->gsvs_ring_bo);
+         ws->buffer_destroy(ws, queue->gsvs_ring_bo);
       }
       queue->gsvs_ring_bo = gsvs_ring_bo;
    }
@@ -1867,8 +1867,8 @@ radv_queue_state_finish(struct radv_queue_state *queue, struct radv_device *devi
    if (queue->descriptor_bo)
       device->ws->buffer_destroy(device->ws, queue->descriptor_bo);
    if (queue->scratch_bo) {
-      device->ws->buffer_destroy(device->ws, queue->scratch_bo);
       radv_rmv_log_command_buffer_bo_destroy(device, queue->scratch_bo);
+      device->ws->buffer_destroy(device->ws, queue->scratch_bo);
    }
    if (queue->esgs_ring_bo) {
       radv_rmv_log_command_buffer_bo_destroy(device, queue->esgs_ring_bo);