Mesa (master): i965: Correct EmitNoIndirect shader compiler option flags.

Kenneth Graunke kwg at kemper.freedesktop.org
Sat Apr 12 00:41:11 UTC 2014


Module: Mesa
Branch: master
Commit: 320e0c5205c8b24cd5428d8b7a914c6e604cc85a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=320e0c5205c8b24cd5428d8b7a914c6e604cc85a

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Apr  8 18:29:01 2014 -0700

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 at whitecape.org>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/mesa/drivers/dri/i965/brw_context.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index e113654..28118b9 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;
    }
 




More information about the mesa-commit mailing list