diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-03-23 15:58:34 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2015-04-01 12:51:04 -0700 |
| commit | 218e45e2f7b2d6c20bbba837f6e5cbe15610771e (patch) | |
| tree | 705665669f863a5d21b953f0f2241de14b741818 /src/mesa/drivers/dri/i965/brw_context.c | |
| parent | b9d7454571029ab330f28164fe6869f5e455ca90 (diff) | |
| download | external_mesa3d-218e45e2f7b2d6c20bbba837f6e5cbe15610771e.zip external_mesa3d-218e45e2f7b2d6c20bbba837f6e5cbe15610771e.tar.gz external_mesa3d-218e45e2f7b2d6c20bbba837f6e5cbe15610771e.tar.bz2 | |
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 <mattst88@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 12 |
1 files 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 21c8bd3..84818f0 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; |