From 9764225ff1dd2017830fe76184fbbe23e1ad5e38 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 19 Feb 2026 12:09:54 +0100 Subject: [PATCH] vulkan: replace VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_MESA with the maint11 flag Signed-off-by: Samuel Pitoiset Part-of: --- src/intel/vulkan/anv_shader_compile.c | 2 +- src/vulkan/runtime/vk_pipeline.c | 2 +- src/vulkan/runtime/vk_shader.c | 2 +- src/vulkan/util/vk_internal_exts.h | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_shader_compile.c b/src/intel/vulkan/anv_shader_compile.c index e6129dc2f1d..820ce98c0a1 100644 --- a/src/intel/vulkan/anv_shader_compile.c +++ b/src/intel/vulkan/anv_shader_compile.c @@ -1613,7 +1613,7 @@ anv_shader_lower_nir(struct anv_device *device, pdevice, shader_data->key.base.robust_flags, set_layouts, set_layout_count, (shader_data->info->flags & - VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_MESA) ? NULL : + VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_KHR) ? NULL : dynamic_descriptors_offsets, shader_data->info->flags & VK_SHADER_CREATE_INDIRECT_BINDABLE_BIT_EXT, &shader_data->bind_map, &shader_data->push_map, mem_ctx); diff --git a/src/vulkan/runtime/vk_pipeline.c b/src/vulkan/runtime/vk_pipeline.c index c60edb7c535..352fd155cdb 100644 --- a/src/vulkan/runtime/vk_pipeline.c +++ b/src/vulkan/runtime/vk_pipeline.c @@ -1271,7 +1271,7 @@ vk_pipeline_to_shader_flags(VkPipelineCreateFlags2KHR pipeline_flags, pipeline_layout != NULL && (pipeline_layout->create_flags & VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT)) - shader_flags |= VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_MESA; + shader_flags |= VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_KHR; return shader_flags; } diff --git a/src/vulkan/runtime/vk_shader.c b/src/vulkan/runtime/vk_shader.c index d3e9aad084e..b69ea1527a8 100644 --- a/src/vulkan/runtime/vk_shader.c +++ b/src/vulkan/runtime/vk_shader.c @@ -312,7 +312,7 @@ vk_shader_compile_info_init(struct vk_shader_compile_info *info, *info = (struct vk_shader_compile_info) { .stage = nir->info.stage, - .flags = vk_info->flags | VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_MESA, + .flags = vk_info->flags | VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_KHR, .next_stage_mask = vk_info->nextStage, .nir = nir, .robustness = rs, diff --git a/src/vulkan/util/vk_internal_exts.h b/src/vulkan/util/vk_internal_exts.h index 497d28bd40b..d2bc167e1e3 100644 --- a/src/vulkan/util/vk_internal_exts.h +++ b/src/vulkan/util/vk_internal_exts.h @@ -145,7 +145,6 @@ static const VkPipelineCreateFlagBits2 #define VK_SHADER_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_MESA 0x1000 #define VK_SHADER_CREATE_UNALIGNED_DISPATCH_BIT_MESA 0x2000 -#define VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_MESA 0x4000 #ifdef __cplusplus }