commit 169c645f12337cdc3e02b628f9cde6a9fb72acc2
author Kenneth Graunke <kenneth@whitecape.org> Sun Apr 06 23:25:00 2014 -0700
committer Kenneth Graunke <kenneth@whitecape.org> Tue Apr 08 00:02:03 2014 -0700
tree 6495da83c2faef2f37016d0a343947b4189dde7d
parent 40d9337406709d0e5e143c51dc5d57921a91aab9

glsl: Pass ctx->Const.NativeIntegers to do_common_optimization().

The next few patches will introduce an optimization that only works when
integers are not represented as floating point values.

v2: Re-word-wrap a line, as requested by Ian Romanick.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>

src/glsl/linker.cpp

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 3bf2789..7c194a2 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2298,7 +2298,9 @@
 
       unsigned max_unroll = ctx->ShaderCompilerOptions[i].MaxUnrollIterations;
 
-      while (do_common_optimization(prog->_LinkedShaders[i]->ir, true, false, max_unroll, &ctx->ShaderCompilerOptions[i]))
+      while (do_common_optimization(prog->_LinkedShaders[i]->ir, true, false,
+                                    max_unroll, &ctx->ShaderCompilerOptions[i],
+                                    ctx->Const.NativeIntegers))
 	 ;
    }