From fd81fda9efa0ed14df36453e4e521ebd86b3d99d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 18 Jun 2025 22:26:03 -0400 Subject: [PATCH] zink: don't use TRANSFER bit as default pipeline stage if no access is set should be TOP_OF_PIPE cc: mesa-stable Part-of: (cherry picked from commit cb026adc4ced77f2fd4eeb22033137c39859f164) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_synchronization.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d6ae0ca9592..6a01ed1d268 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6984,7 +6984,7 @@ "description": "zink: don't use TRANSFER bit as default pipeline stage if no access is set", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_synchronization.cpp b/src/gallium/drivers/zink/zink_synchronization.cpp index 07068e4dff5..bfeb912c164 100644 --- a/src/gallium/drivers/zink/zink_synchronization.cpp +++ b/src/gallium/drivers/zink/zink_synchronization.cpp @@ -675,7 +675,7 @@ pipeline_access_stage(VkAccessFlags flags) VK_PIPELINE_STAGE_GEOMETRY_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT; - return VK_PIPELINE_STAGE_TRANSFER_BIT; + return flags ? VK_PIPELINE_STAGE_TRANSFER_BIT : VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; } ALWAYS_INLINE static bool