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>
This commit is contained in:
Emil Velikov 2011-06-21 21:52:19 +01:00 committed by Bryan Cain
parent 29d21417e3
commit 8c50f18b29

View file

@ -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();
}