glsl_to_tgsi: execute merge_registers() after eliminate_dead_code()
authorEmil Velikov <emil.l.velikov@gmail.com>
Tue, 21 Jun 2011 20:52:19 +0000 (21:52 +0100)
committerBryan Cain <bryancain3@gmail.com>
Mon, 1 Aug 2011 22:59:08 +0000 (17:59 -0500)
commit8c50f18b29637470539d05ccc32b0cae0092aeac
tree70b14e0cbfa9f01bd318c386f193ef84509b023a
parent29d21417e38aed0f0710d3692df320728aef90b1
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>
src/mesa/state_tracker/st_glsl_to_tgsi.cpp