From 4623e861e4b30e9a3878e3d8a9dae7cf8d9b7da2 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 4 Sep 2025 16:56:42 +0200 Subject: [PATCH] radv: fix vk_error in radv_update_preambles() This needs to be a vk object, otherwise it asserts or crashes. Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: (cherry picked from commit 57deff5658cc0fa7dcd2676c552afc4a50e5048d) --- .pick_status.json | 2 +- src/amd/vulkan/radv_queue.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6acad212e21..2579d061534 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -9064,7 +9064,7 @@ "description": "radv: fix vk_error in radv_update_preambles()", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/vulkan/radv_queue.c b/src/amd/vulkan/radv_queue.c index ade56c2a36f..6eba43a5ca6 100644 --- a/src/amd/vulkan/radv_queue.c +++ b/src/amd/vulkan/radv_queue.c @@ -1298,7 +1298,7 @@ fail: radv_bo_destroy(device, NULL, gds_oa_bo); } - return vk_error(queue, result); + return vk_error(device, result); } static VkResult