i965/vec4: Try constant propagate after copy propagate made progress.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
index 2019d15..db6063c 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
@@ -367,8 +367,10 @@ vec4_visitor::opt_copy_propagation()
         if (c != 4)
            continue;
 
-        if (try_constant_propagate(brw, inst, i, values) ||
-            try_copy_propagate(brw, inst, i, values))
+        if (try_constant_propagate(brw, inst, i, values))
+            progress = true;
+
+        if (try_copy_propagate(brw, inst, i, values))
            progress = true;
       }