From 00cc52b282b94d214c23f2fcb1e21690acaf3308 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 29 Mar 2022 09:26:40 +0200 Subject: [PATCH] radv: remove now unused radv_nir_compiler_options::layout Descriptors are lowered in NIR and the layout is no longer used in the backend compilers. Signed-off-by: Samuel Pitoiset Reviewed-by: Rhys Perry Part-of: --- src/amd/vulkan/radv_shader.c | 1 - src/amd/vulkan/radv_shader.h | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 51a49b60af3..8a7f9695e9a 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -2037,7 +2037,6 @@ radv_shader_compile(struct radv_device *device, struct vk_shader_module *module, gl_shader_stage stage = shaders[shader_count - 1]->info.stage; struct radv_nir_compiler_options options = {0}; - options.layout = layout; if (key) options.key = *key; diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 03ed9a566d8..88cb617a148 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -112,7 +112,6 @@ enum radv_compiler_debug_level { }; struct radv_nir_compiler_options { - struct radv_pipeline_layout *layout; struct radv_pipeline_key key; bool robust_buffer_access; bool dump_shader; @@ -501,6 +500,8 @@ struct radv_shader_prolog { char *disasm_string; }; +struct radv_pipeline_layout; + void radv_optimize_nir(struct nir_shader *shader, bool optimize_conservatively, bool allow_copies); void radv_optimize_nir_algebraic(nir_shader *shader, bool opt_offsets); bool radv_nir_lower_ycbcr_textures(nir_shader *shader, const struct radv_pipeline_layout *layout);