From: Matt Turner <mattst88@gmail.com>
Date: Sat, 25 Apr 2015 08:50:04 +0000 (-0700)
Subject: i965/fs: Disallow constant propagation into POW on Gen 6.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7f5a8ac155283e78df2da5b172a65361a80d38b6;p=mesa.git

i965/fs: Disallow constant propagation into POW on Gen 6.

Fixes assertion failures in three piglit tests on Gen 6 since commit
0087cf23e.
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
index 9542d6a20ce..c9ce2bd4513 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
@@ -506,9 +506,15 @@ fs_visitor::try_constant_propagate(fs_inst *inst, acp_entry *entry)
             break;
          /* fallthrough */
       case SHADER_OPCODE_POW:
-         /* Allow constant propagation into src1 regardless of generation, and
-          * let constant combining promote the constant on Gen < 8.
+         /* Allow constant propagation into src1 (except on Gen 6), and let
+          * constant combining promote the constant on Gen < 8.
+          *
+          * While Gen 6 MATH can take a scalar source, its source and
+          * destination offsets must be equal and we cannot ensure that.
           */
+         if (devinfo->gen == 6)
+            break;
+         /* fallthrough */
       case BRW_OPCODE_BFI1:
       case BRW_OPCODE_ASR:
       case BRW_OPCODE_SHL: