From f550eb1903cb4c9a2f8b72da3aecb1eaa5a61608 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Thu, 5 Mar 2026 12:30:16 +0100 Subject: [PATCH] vulkan: Do not override the shader_flags in case of no task shader This should be doing a or and not an assign. This fixes issues on NVK with mesh stages on DGC. Signed-off-by: Mary Guillemard Fixes: 9308e8d90d2 ("vulkan: Add generic graphics and compute VkPipeline implementations") Reviewed-by: Lionel Landwerlin (cherry picked from commit 8f2eeee7bacd40d9107eeaec609c8add44f2a077) Part-of: --- .pick_status.json | 2 +- src/vulkan/runtime/vk_pipeline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 48e8ea99088..1813a8a55d6 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -514,7 +514,7 @@ "description": "vulkan: Do not override the shader_flags in case of no task shader", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "9308e8d90d26fca678fe72380d899cdae77415b5", "notes": null diff --git a/src/vulkan/runtime/vk_pipeline.c b/src/vulkan/runtime/vk_pipeline.c index d0bf7609dbc..8a20341e58e 100644 --- a/src/vulkan/runtime/vk_pipeline.c +++ b/src/vulkan/runtime/vk_pipeline.c @@ -1739,7 +1739,7 @@ vk_graphics_pipeline_compile_shaders(struct vk_device *device, if ((compile_info->part_stages[p] & VK_SHADER_STAGE_MESH_BIT_EXT) && !(all_stages & VK_SHADER_STAGE_TASK_BIT_EXT)) - shader_flags = VK_SHADER_CREATE_NO_TASK_SHADER_BIT_EXT; + shader_flags |= VK_SHADER_CREATE_NO_TASK_SHADER_BIT_EXT; VkShaderStageFlags next_stage; if (stage->stage == MESA_SHADER_FRAGMENT) {