From 1c3a61979b6478e3a7bd17eb2e788bd066551a20 Mon Sep 17 00:00:00 2001
From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sat, 15 Jan 2022 14:43:15 +0100
Subject: [PATCH] radv: Fix preamble argument order.

Used the wrong cmdbuffer in the wrong situation. Oops.

Fixes: 915e9178faf ("radv: Split out commandbuffer submission.")
Reviewed-By: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14574>
(cherry picked from commit 79131b6ee6c98a8b662aeb32bb623a8974f8bef5)
---
 .pick_status.json            | 2 +-
 src/amd/vulkan/radv_device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 17188dbf16a..5a52bc6f61e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -688,7 +688,7 @@
         "description": "radv: Fix preamble argument order.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "915e9178faf9c0ee9098b8915d8b30009ae4f08d"
     },
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index e3c21b98c51..ecdf57fc64a 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -4336,7 +4336,7 @@ radv_queue_submit(struct vk_queue *vqueue, struct vk_queue_submit *submission)
 
    result =
       radv_get_preambles(queue, submission->command_buffers, submission->command_buffer_count,
-                         &initial_preamble_cs, &initial_flush_preamble_cs, &continue_preamble_cs);
+                         &initial_flush_preamble_cs, &initial_preamble_cs, &continue_preamble_cs);
    if (result != VK_SUCCESS)
       goto fail;