From 80390f91a0e200ae29a678bda495b91f6452023a Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 17 Mar 2015 13:10:19 -0700 Subject: [PATCH] i965/nir: Use NIR lowering for ffma for gen < 6 Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/brw_context.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index a39443aa6e4..ed6fdffd265 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -551,7 +551,12 @@ brw_initialize_context_constants(struct brw_context *brw) ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxInputComponents = 128; } - static const nir_shader_compiler_options nir_options = { + static const nir_shader_compiler_options gen4_nir_options = { + .native_integers = true, + .lower_ffma = true, + }; + + static const nir_shader_compiler_options gen6_nir_options = { .native_integers = true, }; @@ -568,7 +573,10 @@ brw_initialize_context_constants(struct brw_context *brw) (i == MESA_SHADER_FRAGMENT); ctx->Const.ShaderCompilerOptions[i].EmitNoIndirectUniform = false; ctx->Const.ShaderCompilerOptions[i].LowerClipDistance = true; - ctx->Const.ShaderCompilerOptions[i].NirOptions = &nir_options; + if (brw->gen >= 6) + ctx->Const.ShaderCompilerOptions[i].NirOptions = &gen6_nir_options; + else + ctx->Const.ShaderCompilerOptions[i].NirOptions = &gen4_nir_options; } ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].OptimizeForAOS = true; -- 2.30.2