fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vulkan: replace VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_MESA with the maint11 flag

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41377>
This commit is contained in:
Samuel Pitoiset 2026-02-19 12:09:54 +01:00 • committed by Marge Bot
parent 567a65bbbf
commit 9764225ff1
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/intel/vulkan/anv_shader_compile.c
View file

@ -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);

2
src/vulkan/runtime/vk_pipeline.c
View file

@ -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;
}

2
src/vulkan/runtime/vk_shader.c
View file

@ -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,

1
src/vulkan/util/vk_internal_exts.h
View file

@ -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
}