Mesa (10.4): i965/vec4: Don' t lose the saturate modifier in copy propagation.

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: d4a95ffcdae7f99a08f45c651bcc1fee35f496bf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4a95ffcdae7f99a08f45c651bcc1fee35f496bf

Author: Andrey Sudnik <andrey.sudnik at intel.com>
Date:   Thu Mar  5 11:16:49 2015 -0800

i965/vec4: Don't lose the saturate modifier in copy propagation.

Cc: 10.4, 10.5 <mesa-stable at lists.freedesktop.org>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89224
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 0dfec59a2785cf7a87ee5128889ecebe810b611b)

---

 src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 65564c9..1df90cc 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
@@ -415,7 +415,7 @@ vec4_visitor::opt_copy_propagation()
 	 entries[reg].saturatemask = 0x0;
 	 for (int i = 0; i < 4; i++) {
 	    if (inst->dst.writemask & (1 << i)) {
-               entries[reg].value[i] = direct_copy ? &inst->src[0] : NULL;
+               entries[reg].value[i] = (!inst->saturate && direct_copy) ? &inst->src[0] : NULL;
                entries[reg].saturatemask |= (((inst->saturate && direct_copy) ? 1 : 0) << i);
 	    }
 	 }