Module: Mesa Branch: main Commit: ea89328fb41a0ebc497e8045e468070ea8af5931 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea89328fb41a0ebc497e8045e468070ea8af5931
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Thu Jan 11 13:47:15 2024 +0100 radv: remove unecessary radv_nir_compiler_options::key This is no longer useful. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27007> --- src/amd/vulkan/radv_shader.c | 5 +---- src/amd/vulkan/radv_shader.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 4564d6b4256..22172813bdc 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -2413,9 +2413,6 @@ radv_fill_nir_compiler_options(struct radv_nir_compiler_options *options, struct const struct radv_pipeline_key *key, bool should_use_wgp, bool can_dump_shader, bool is_meta_shader, bool keep_shader_info, bool keep_statistic_info) { - if (key) - options->key = *key; - /* robust_buffer_access_llvm here used by LLVM only, pipeline robustness is not exposed there. */ options->robust_buffer_access_llvm = device->buffer_robustness >= RADV_BUFFER_ROBUSTNESS_1; options->wgp_mode = should_use_wgp; @@ -2425,7 +2422,7 @@ radv_fill_nir_compiler_options(struct radv_nir_compiler_options *options, struct options->record_ir = keep_shader_info; options->record_stats = keep_statistic_info; options->check_ir = device->instance->debug_flags & RADV_DEBUG_CHECKIR; - options->enable_mrt_output_nan_fixup = options->key.ps.epilog.enable_mrt_output_nan_fixup; + options->enable_mrt_output_nan_fixup = key ? key->ps.epilog.enable_mrt_output_nan_fixup : false; } static void diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 1ba3fd4e759..09918ac6ae0 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -170,7 +170,6 @@ struct radv_pipeline_key { }; struct radv_nir_compiler_options { - struct radv_pipeline_key key; bool robust_buffer_access_llvm; bool dump_shader; bool dump_preoptir;
