From 0fbec6dd79ee02989b5541f272a23fd32f0fa797 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Thu, 29 Jun 2023 01:08:21 +0800 Subject: [PATCH] radv: Use nir_remove_non_entrypoints in radv_shader.c Signed-off-by: Yonggang Luo Reviewed-by: Faith Ekstrand Part-of: --- src/amd/vulkan/radv_shader.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 10ee584e8c1..3ad4579e8c3 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -477,13 +477,7 @@ radv_shader_spirv_to_nir(struct radv_device *device, const struct radv_pipeline_ NIR_PASS(_, nir, nir_opt_deref); /* Pick off the single entrypoint that we want */ - foreach_list_typed_safe (nir_function, func, node, &nir->functions) { - if (func->is_entrypoint) - func->name = ralloc_strdup(func, "main"); - else - exec_node_remove(&func->node); - } - assert(exec_list_length(&nir->functions) == 1); + nir_remove_non_entrypoints(nir); /* Make sure we lower constant initializers on output variables so that * nir_remove_dead_variables below sees the corresponding stores