Module: Mesa Branch: staging/23.1 Commit: b84dc33bc810dadf11c0366281c93ed3774c872a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b84dc33bc810dadf11c0366281c93ed3774c872a
Author: Connor Abbott <[email protected]> Date: Fri Jul 14 20:12:27 2023 +0200 tu: Fix vk2tu_*_stage flag type New flags were silently getting dropped. Fixes: 59259a01671 ("tu: Convert to sync2 entrypoints") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24162> (cherry picked from commit ed020942350c6c7a7614c04d1d0f0a78b4f84aed) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_cmd_buffer.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0a5c45e45bd..9a56244cde7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -22,7 +22,7 @@ "description": "tu: Fix vk2tu_*_stage flag type", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "59259a0167184e0cf9f472d379ac9723a2842139" }, diff --git a/src/freedreno/vulkan/tu_cmd_buffer.cc b/src/freedreno/vulkan/tu_cmd_buffer.cc index 88e9fa24205..7faa5c155b5 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.cc +++ b/src/freedreno/vulkan/tu_cmd_buffer.cc @@ -3922,10 +3922,10 @@ vk2tu_single_stage(VkPipelineStageFlags2 vk_stage, bool dst) } static enum tu_stage -vk2tu_src_stage(VkPipelineStageFlags vk_stages) +vk2tu_src_stage(VkPipelineStageFlags2 vk_stages) { enum tu_stage stage = TU_STAGE_CP; - u_foreach_bit (bit, vk_stages) { + u_foreach_bit64 (bit, vk_stages) { enum tu_stage new_stage = vk2tu_single_stage(1ull << bit, false); stage = MAX2(stage, new_stage); } @@ -3934,10 +3934,10 @@ vk2tu_src_stage(VkPipelineStageFlags vk_stages) } static enum tu_stage -vk2tu_dst_stage(VkPipelineStageFlags vk_stages) +vk2tu_dst_stage(VkPipelineStageFlags2 vk_stages) { enum tu_stage stage = TU_STAGE_PS; - u_foreach_bit (bit, vk_stages) { + u_foreach_bit64 (bit, vk_stages) { enum tu_stage new_stage = vk2tu_single_stage(1ull << bit, true); stage = MIN2(stage, new_stage); }
