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

radv: remove radv_shader_layout::push_constant_size

Browse source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37769>
This commit is contained in:
Samuel Pitoiset 2025-10-08 16:45:41 +02:00 • committed by Marge Bot
parent 2985322ed1
commit d15b411262
3 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -229,7 +229,6 @@ radv_shader_layout_init(const struct radv_pipeline_layout *pipeline_layout, mesa
layout->set[i].dynamic_offset_start = pipeline_layout->set[i].dynamic_offset_start; layout->set[i].dynamic_offset_start = pipeline_layout->set[i].dynamic_offset_start;
} }
layout->push_constant_size = pipeline_layout->push_constant_size;
layout->use_dynamic_descriptors = pipeline_layout->dynamic_offset_count && layout->use_dynamic_descriptors = pipeline_layout->dynamic_offset_count &&
(pipeline_layout->dynamic_shader_stages & mesa_to_vk_shader_stage(stage)); (pipeline_layout->dynamic_shader_stages & mesa_to_vk_shader_stage(stage));
} }

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

@ -249,7 +249,6 @@ struct radv_shader_layout {
uint32_t dynamic_offset_start; uint32_t dynamic_offset_start;
} set[MAX_SETS]; } set[MAX_SETS];
uint32_t push_constant_size;
uint32_t dynamic_offset_count; uint32_t dynamic_offset_count;
bool use_dynamic_descriptors; bool use_dynamic_descriptors;
}; };

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

@ -88,13 +88,6 @@ radv_shader_stage_init(const VkShaderCreateInfoEXT *sinfo, struct radv_shader_st
out_stage->layout.use_dynamic_descriptors = true; out_stage->layout.use_dynamic_descriptors = true;
} }
for (unsigned i = 0; i < sinfo->pushConstantRangeCount; ++i) {
const VkPushConstantRange *range = sinfo->pPushConstantRanges + i;
out_stage->layout.push_constant_size = MAX2(out_stage->layout.push_constant_size, range->offset + range->size);
}
out_stage->layout.push_constant_size = align(out_stage->layout.push_constant_size, 16);
const VkShaderRequiredSubgroupSizeCreateInfoEXT *const subgroup_size = const VkShaderRequiredSubgroupSizeCreateInfoEXT *const subgroup_size =
vk_find_struct_const(sinfo->pNext, SHADER_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT); vk_find_struct_const(sinfo->pNext, SHADER_REQUIRED_SUBGROUP_SIZE_CREATE_INFO_EXT);
@ -272,15 +265,6 @@ radv_get_shader_layout(const VkShaderCreateInfoEXT *pCreateInfo, struct radv_sha
if (layout->dynamic_offset_count && (dynamic_shader_stages & pCreateInfo->stage)) { if (layout->dynamic_offset_count && (dynamic_shader_stages & pCreateInfo->stage)) {
layout->use_dynamic_descriptors = true; layout->use_dynamic_descriptors = true;
} }
layout->push_constant_size = 0;
for (unsigned i = 0; i < pCreateInfo->pushConstantRangeCount; ++i) {
const VkPushConstantRange *range = pCreateInfo->pPushConstantRanges + i;
layout->push_constant_size = MAX2(layout->push_constant_size, range->offset + range->size);
}
layout->push_constant_size = align(layout->push_constant_size, 16);
} }
static VkResult static VkResult