diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index ffb30464fa6..cbdcc033f29 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -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->push_constant_size = pipeline_layout->push_constant_size; layout->use_dynamic_descriptors = pipeline_layout->dynamic_offset_count && (pipeline_layout->dynamic_shader_stages & mesa_to_vk_shader_stage(stage)); } diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 147037a51c0..ef23a1b35d5 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -249,7 +249,6 @@ struct radv_shader_layout { uint32_t dynamic_offset_start; } set[MAX_SETS]; - uint32_t push_constant_size; uint32_t dynamic_offset_count; bool use_dynamic_descriptors; }; diff --git a/src/amd/vulkan/radv_shader_object.c b/src/amd/vulkan/radv_shader_object.c index 81bd950272e..909a4eae4d9 100644 --- a/src/amd/vulkan/radv_shader_object.c +++ b/src/amd/vulkan/radv_shader_object.c @@ -88,13 +88,6 @@ radv_shader_stage_init(const VkShaderCreateInfoEXT *sinfo, struct radv_shader_st 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 = 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)) { 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