Mesa (master): i965/vec4: Try constant propagate after copy propagate made progress.

[Matt Turner]

Module: Mesa
Branch: master
Commit: 9a8acafa47558cafeb37f80f4b30061ac1962c69
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a8acafa47558cafeb37f80f4b30061ac1962c69

Author: Matt Turner <mattst88 at gmail.com>
Date:   Mon Jun 23 22:29:57 2014 -0700

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

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

---

 src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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
--- 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;
       }