i965: Avoid register coalescing away MATH workarounds on Ivybridge.

The MATH instruction cannot handle source modifiers, even on Gen7.
So, apply this workaround for Sandybridge on Ivybridge as well.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 8dee849edd423e07923681085bebafc15b5e743d..1b0e7e82fbedf3f460143586a6fd176b8c8f3b4a 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -3386,7 +3386,7 @@ fs_visitor::register_coalesce()
         /* The gen6 MATH instruction can't handle source modifiers, so avoid
          * coalescing those for now.  We should do something more specific.
          */
-        if (intel->gen == 6 && scan_inst->is_math() && has_source_modifiers) {
+        if (intel->gen >= 6 && scan_inst->is_math() && has_source_modifiers) {
            interfered = true;
            break;
         }