diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2011-06-21 21:52:19 +0100 |
|---|---|---|
| committer | Bryan Cain <bryancain3@gmail.com> | 2011-08-01 17:59:08 -0500 |
| commit | 8c50f18b29637470539d05ccc32b0cae0092aeac (patch) | |
| tree | 70b14e0cbfa9f01bd318c386f193ef84509b023a | |
| parent | 29d21417e38aed0f0710d3692df320728aef90b1 (diff) | |
glsl_to_tgsi: execute merge_registers() after eliminate_dead_code()
Fixes a regression unintentionally introduced by "glsl_to_tgsi: fix shaders with
indirect addressing of temps" that caused missing leaves in 3dmark01 test 4 (Nature)
and missing/displaced textures on human models in Counter-Strike: Source.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Bryan Cain <bryancain3@gmail.com>
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 322bfbbf1ab..abeb44a4083 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -4274,8 +4274,8 @@ get_mesa_program(struct gl_context *ctx, */ if (!v->indirect_addr_temps) { v->copy_propagate(); - v->merge_registers(); v->eliminate_dead_code(); + v->merge_registers(); v->renumber_registers(); } |