Module: Mesa
Branch: staging/23.3
Commit: 32bfb5468fb0b52417d2596758301881d797ee2f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=32bfb5468fb0b52417d2596758301881d797ee2f
Author: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Date: Tue Dec 12 10:04:21 2023 +0200
anv: fix incorrect queue_family access on command buffer
The queue_family field is not an array, but a pointer.
Signed-off-by: Lionel Landwerlin <lionel.g.landwer...@intel.com>
Fixes: 9866c4e32b ("anv: Skip layout transition on the compute queue")
Reviewed-by: Rohan Garg <rohan.g...@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26645>
(cherry picked from commit aa8c88f96cd3cc0078edfdff1e1cd7f40869a883)
---
.pick_status.json | 2 +-
src/intel/vulkan/genX_cmd_buffer.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 1224dd1ab36..13923ee2756 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -994,7 +994,7 @@
"description": "anv: fix incorrect queue_family access on command
buffer",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "9866c4e32b50c6682d33f248ddb5c80a06040152",
"notes": null
diff --git a/src/intel/vulkan/genX_cmd_buffer.c
b/src/intel/vulkan/genX_cmd_buffer.c
index 2a1ed111f2f..076bc97737d 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -915,7 +915,7 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer,
dst_queue_family != VK_QUEUE_FAMILY_IGNORED &&
src_queue_family != dst_queue_family) {
enum intel_engine_class src_engine =
- cmd_buffer->queue_family[src_queue_family].engine_class;
+ cmd_buffer->queue_family->engine_class;
if (src_engine != INTEL_ENGINE_CLASS_RENDER)
return;
}
