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

radv: add shader info about whether descriptor heap is used

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39483>
This commit is contained in:
Samuel Pitoiset 2025-06-26 12:26:34 +02:00 • committed by Marge Bot
parent 62629d3e3c
commit b29743f91c
5 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/amd/vulkan/radv_pipeline.c
View file

@ -145,6 +145,9 @@ radv_pipeline_get_shader_key(const struct radv_device *device, const VkPipelineS
if (flags & VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT)
key.indirect_bindable = 1;
if (flags & VK_PIPELINE_CREATE_2_DESCRIPTOR_HEAP_BIT_EXT)
key.descriptor_heap = 1;
if (stage->stage & RADV_GRAPHICS_STAGE_BITS) {
key.version = instance->drirc.misc.override_graphics_shader_version;
} else if (stage->stage & RADV_RT_STAGE_BITS) {

1
src/amd/vulkan/radv_shader.h
View file

@ -82,6 +82,7 @@ struct radv_shader_stage_key {
uint8_t keep_statistic_info : 1;
uint8_t keep_executable_info : 1;
uint8_t view_index_from_device_index : 1;
uint8_t descriptor_heap : 1;
/* Shader version (up to 8) to force re-compilation when RADV_BUILD_ID_OVERRIDE is enabled. */
uint8_t version : 3;

1
src/amd/vulkan/radv_shader_info.c
View file

@ -1084,6 +1084,7 @@ radv_nir_shader_info_pass(struct radv_device *device, const struct nir_shader *n
info->user_data_0 = radv_get_user_data_0(pdev->info.gfx_level, info);
info->merged_shader_compiled_separately = radv_is_merged_shader_compiled_separately(pdev->info.gfx_level, info);
info->force_indirect_descriptors = info->merged_shader_compiled_separately || stage_key->indirect_bindable;
info->descriptor_heap = stage_key->descriptor_heap;
switch (nir->info.stage) {
case MESA_SHADER_COMPUTE:

1
src/amd/vulkan/radv_shader_info.h
View file

@ -117,6 +117,7 @@ struct radv_shader_info {
bool merged_shader_compiled_separately : 1; /* GFX9+ */
bool force_indirect_descriptors : 1;
bool ngg_wave_id_en : 1;
bool descriptor_heap : 1;
struct {
uint64_t tcs_inputs_via_temp;

3
src/amd/vulkan/radv_shader_object.c
View file

@ -119,6 +119,9 @@ radv_shader_stage_init(const VkShaderCreateInfoEXT *sinfo, struct radv_shader_st
if (sinfo->flags & VK_SHADER_CREATE_INDIRECT_BINDABLE_BIT_EXT)
out_stage->key.indirect_bindable = 1;
if (sinfo->flags & VK_SHADER_CREATE_DESCRIPTOR_HEAP_BIT_EXT)
out_stage->key.descriptor_heap = 1;
if (out_stage->stage == MESA_SHADER_MESH) {
out_stage->key.has_task_shader = !(sinfo->flags & VK_SHADER_CREATE_NO_TASK_SHADER_BIT_EXT);
}