From d2064c52fb83a208c2ef3f90f15e444f36df2449 Mon Sep 17 00:00:00 2001 From: Haihao Xiang Date: Fri, 22 Sep 2023 16:22:23 +0800 Subject: [PATCH] anv: Fix typo in transition_color_buffer Signed-off-by: Haihao Xiang Reviewed-by: Lionel Landwerlin Cc: mesa-stable Part-of: (cherry picked from commit 29d18f3ca90ba16ea02b0b3b93d5b07dfd6d9f2b) --- .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 dad408d80d3..a763cff1af1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1074,7 +1074,7 @@ "description": "anv: Fix typo in transition_color_buffer", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c index 8933c12bda4..ba8f5ac119f 100644 --- a/src/intel/vulkan/genX_cmd_buffer.c +++ b/src/intel/vulkan/genX_cmd_buffer.c @@ -893,7 +893,7 @@ transition_color_buffer(struct anv_cmd_buffer *cmd_buffer, 0 : src_queue_family].queueFlags; const VkQueueFlagBits dst_queue_flags = device->physical->queue.families[ - (dst_queue_external || src_queue_family == VK_QUEUE_FAMILY_IGNORED) ? + (dst_queue_external || dst_queue_family == VK_QUEUE_FAMILY_IGNORED) ? 0 : dst_queue_family].queueFlags; /* Simultaneous acquire and release on external queues is illegal. */