Mesa (glsl2): glsl2: Use linked ir_constant_variable after linking, instead of unlinked.

Eric Anholt anholt at kemper.freedesktop.org
Thu Aug 5 04:06:09 UTC 2010


Module: Mesa
Branch: glsl2
Commit: e3a90b8e38b1d0de9f473caca96779e215071315
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3a90b8e38b1d0de9f473caca96779e215071315

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Aug  4 17:12:14 2010 -0700

glsl2: Use linked ir_constant_variable after linking, instead of unlinked.

---

 src/glsl/linker.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 10fd2d5..b2953c6 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -1293,7 +1293,7 @@ link_shaders(struct gl_shader_program *prog)
 	 progress = do_dead_code_local(ir) || progress;
 	 progress = do_dead_code(ir) || progress;
 	 progress = do_tree_grafting(ir) || progress;
-	 progress = do_constant_variable_unlinked(ir) || progress;
+	 progress = do_constant_variable(ir) || progress;
 	 progress = do_constant_folding(ir) || progress;
 	 progress = do_algebraic(ir) || progress;
 	 progress = do_if_return(ir) || progress;




More information about the mesa-commit mailing list