From 622e2ae08a86178fc518280d6266b03b7122ea64 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Fri, 13 May 2022 12:52:35 +1000 Subject: [PATCH] svga: remove duplicate nir compile options In a later merge request to remove the old GLSL IR loop unrolling code we will add two additional compiler options stucts here. This commit helps to avoid duplication getting out of hand. Reviewed-by: Neha Bhende Reviewed-by: Charmaine Lee Part-of: --- src/gallium/drivers/svga/svga_screen.c | 41 ++++++++++---------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index 205f79783fe..b573fd00e35 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -757,38 +757,29 @@ vgpu10_get_shader_param(struct pipe_screen *screen, return 0; } -static const nir_shader_compiler_options svga_vgpu9_compiler_options = { - .lower_bitops = true, - .lower_extract_byte = true, - .lower_extract_word = true, - .lower_insert_byte = true, - .lower_insert_word = true, - .lower_fdph = true, - .lower_flrp64 = true, - .lower_rotate = true, - .lower_uniforms_to_ubo = true, - .lower_vector_cmp = true, +#define COMMON_OPTIONS \ + .lower_extract_byte = true, \ + .lower_extract_word = true, \ + .lower_insert_byte = true, \ + .lower_insert_word = true, \ + .lower_fdph = true, \ + .lower_flrp64 = true, \ + .lower_rotate = true, \ + .lower_uniforms_to_ubo = true, \ + .lower_vector_cmp = true, \ + .max_unroll_iterations = 32, \ + .use_interpolated_input_intrinsics = true - .max_unroll_iterations = 32, - .use_interpolated_input_intrinsics = true, +static const nir_shader_compiler_options svga_vgpu9_compiler_options = { + COMMON_OPTIONS, + .lower_bitops = true, }; static const nir_shader_compiler_options svga_vgpu10_compiler_options = { + COMMON_OPTIONS, .lower_doubles_options = nir_lower_dfloor, - .lower_extract_byte = true, - .lower_extract_word = true, - .lower_insert_byte = true, - .lower_insert_word = true, - .lower_fdph = true, - .lower_flrp64 = true, .lower_fmod = true, .lower_fpow = true, - .lower_rotate = true, - .lower_uniforms_to_ubo = true, - .lower_vector_cmp = true, - - .max_unroll_iterations = 32, - .use_interpolated_input_intrinsics = true, }; static const void *