From 218e45e2f7b2d6c20bbba837f6e5cbe15610771e Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 23 Mar 2015 15:58:34 -0700 Subject: [PATCH] i965: Use the same nir options for all gens If we tell NIR to split ffma's, then we don't need seperate options anymore. Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_context.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index 21c8bd331b5..84818f04e90 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -551,12 +551,7 @@ brw_initialize_context_constants(struct brw_context *brw) ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents = 128; } - static const nir_shader_compiler_options gen4_nir_options = { - .native_integers = true, - .lower_ffma = true, - }; - - static const nir_shader_compiler_options gen6_nir_options = { + static const nir_shader_compiler_options nir_options = { .native_integers = true, /* In order to help allow for better CSE at the NIR level we tell NIR * to split all ffma instructions during opt_algebraic and we then @@ -578,10 +573,7 @@ brw_initialize_context_constants(struct brw_context *brw) (i == MESA_SHADER_FRAGMENT); ctx->Const.ShaderCompilerOptions[i].EmitNoIndirectUniform = false; ctx->Const.ShaderCompilerOptions[i].LowerClipDistance = true; - if (brw->gen >= 6) - ctx->Const.ShaderCompilerOptions[i].NirOptions = &gen6_nir_options; - else - ctx->Const.ShaderCompilerOptions[i].NirOptions = &gen4_nir_options; + ctx->Const.ShaderCompilerOptions[i].NirOptions = &nir_options; } ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].OptimizeForAOS = true; -- 2.30.2