fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-06 01:30:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

vulkan/runtime: add an internal flag for independent sets

Browse source 
Shader objects are by definition I think independents.

But implementation like Anv would like to optimize dynamic descriptors
if possible. It's possible if the sets are not independent.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
(cherry picked from commit 104206fb0f)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39003>
This commit is contained in:
Lionel Landwerlin 2025-11-26 16:17:38 +02:00 • committed by Dylan Baker
parent 837aa643cf
commit bf02a31dd4
3 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1097,7 +1097,8 @@ vk_graphics_pipeline_cmd_bind(struct vk_command_buffer *cmd_buffer,
static VkShaderCreateFlagsEXT
vk_pipeline_to_shader_flags(VkPipelineCreateFlags2KHR pipeline_flags,
mesa_shader_stage stage)
mesa_shader_stage stage,
struct vk_pipeline_layout *pipeline_layout)
{
VkShaderCreateFlagsEXT shader_flags = 0;
@ -1123,6 +1124,15 @@ vk_pipeline_to_shader_flags(VkPipelineCreateFlags2KHR pipeline_flags,
shader_flags |= VK_SHADER_CREATE_UNALIGNED_DISPATCH_BIT_MESA;
}
/* Independent sets has no impact on compute shaders since there is only
* ever one shader in the pipeline.
*/
if (stage != MESA_SHADER_COMPUTE &&
pipeline_layout != NULL &&
(pipeline_layout->create_flags &
VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT))
shader_flags |= VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_MESA;
return shader_flags;
}
@ -1247,7 +1257,8 @@ vk_graphics_pipeline_compile_shaders(struct vk_device *device,
sizeof(stage->precomp->blake3));
VkShaderCreateFlagsEXT shader_flags =
vk_pipeline_to_shader_flags(pipeline->base.flags, stage->stage);
vk_pipeline_to_shader_flags(pipeline->base.flags, stage->stage,
pipeline_layout);
_mesa_blake3_update(&blake3_ctx, &shader_flags, sizeof(shader_flags));
}
@ -1367,7 +1378,8 @@ vk_graphics_pipeline_compile_shaders(struct vk_device *device,
struct vk_pipeline_stage *stage = &stages[i];
VkShaderCreateFlagsEXT shader_flags =
vk_pipeline_to_shader_flags(pipeline->base.flags, stage->stage);
vk_pipeline_to_shader_flags(pipeline->base.flags, stage->stage,
pipeline_layout);
if (partition[p + 1] - partition[p] > 1)
shader_flags |= VK_SHADER_CREATE_LINK_STAGE_BIT_EXT;
@ -2025,7 +2037,8 @@ vk_pipeline_compile_compute_stage(struct vk_device *device,
}
VkShaderCreateFlagsEXT shader_flags =
vk_pipeline_to_shader_flags(pipeline->base.flags, MESA_SHADER_COMPUTE);
vk_pipeline_to_shader_flags(pipeline->base.flags, MESA_SHADER_COMPUTE,
pipeline_layout);
struct mesa_blake3 blake3_ctx;
_mesa_blake3_init(&blake3_ctx);
@ -2494,7 +2507,8 @@ vk_pipeline_compile_rt_shader(struct vk_device *device,
_mesa_blake3_init(&blake3_ctx);
VkShaderCreateFlagsEXT shader_flags =
vk_pipeline_to_shader_flags(pipeline_flags, stage->stage);
vk_pipeline_to_shader_flags(pipeline_flags, stage->stage,
pipeline_layout);
hash_rt_parameters(&blake3_ctx, shader_flags,
pipeline_flags,
@ -2618,7 +2632,8 @@ vk_pipeline_compile_rt_shader_group(struct vk_device *device,
}
VkShaderCreateFlagsEXT shader_flags =
vk_pipeline_to_shader_flags(pipeline_flags, stages[i].stage);
vk_pipeline_to_shader_flags(pipeline_flags, stages[i].stage,
pipeline_layout);
hash_rt_parameters(&blake3_ctx, shader_flags, pipeline_flags,
push_range, pipeline_layout);
@ -2681,7 +2696,8 @@ vk_pipeline_compile_rt_shader_group(struct vk_device *device,
compile_info[i] = (struct vk_shader_compile_info) {
.stage = stages[i].stage,
.flags = vk_pipeline_to_shader_flags(pipeline_flags,
stages[i].stage),
stages[i].stage,
pipeline_layout),
.rt_flags = pipeline_flags & MESA_VK_PIPELINE_RAY_TRACING_FLAGS,
.next_stage_mask = 0,
.nir = vk_pipeline_precomp_shader_get_nir(stages[i].precomp,

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

@ -204,7 +204,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,
.flags = vk_info->flags | VK_SHADER_CREATE_INDEPENDENT_SETS_BIT_MESA,
.next_stage_mask = vk_info->nextStage,
.nir = nir,
.robustness = rs,

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

@ -152,6 +152,7 @@ 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
}