From: Kenneth Graunke <kenneth@whitecape.org>
Date: Wed, 9 Apr 2014 01:29:01 +0000 (-0700)
Subject: i965: Correct EmitNoIndirect shader compiler option flags.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=320e0c5205c8b24cd5428d8b7a914c6e604cc85a;p=mesa.git

i965: Correct EmitNoIndirect shader compiler option flags.

These were out of sync with the flags used to control
lower_variable_index_to_cond_assign in brw_shader.cpp.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index e11365484cd..28118b967c5 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -485,12 +485,11 @@ brw_initialize_context_constants(struct brw_context *brw)
       ctx->ShaderCompilerOptions[i].EmitNoNoise = true;
       ctx->ShaderCompilerOptions[i].EmitNoMainReturn = true;
       ctx->ShaderCompilerOptions[i].EmitNoIndirectInput = true;
-      ctx->ShaderCompilerOptions[i].EmitNoIndirectOutput = true;
-
-      ctx->ShaderCompilerOptions[i].EmitNoIndirectUniform =
+      ctx->ShaderCompilerOptions[i].EmitNoIndirectOutput =
 	 (i == MESA_SHADER_FRAGMENT);
       ctx->ShaderCompilerOptions[i].EmitNoIndirectTemp =
 	 (i == MESA_SHADER_FRAGMENT);
+      ctx->ShaderCompilerOptions[i].EmitNoIndirectUniform = false;
       ctx->ShaderCompilerOptions[i].LowerClipDistance = true;
    }