i965/vec4: Make with_writemask() non-static.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_vec4_copy_propagation.cpp

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 39eef4b0d6571edf5c8d75afcb606a5495dfb766..fdbe96c2e01d36f84a8e627543a1dda3d46d69f0 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
@@ -95,6 +95,7 @@ try_constant_propagation(vec4_instruction *inst, int arg, src_reg *values[4])
       inst->src[arg] = value;
       return true;
 
+   case BRW_OPCODE_MACH:
    case BRW_OPCODE_MUL:
    case BRW_OPCODE_ADD:
       if (arg == 1) {
@@ -102,9 +103,10 @@ try_constant_propagation(vec4_instruction *inst, int arg, src_reg *values[4])
         return true;
       } else if (arg == 0 && inst->src[1].file != IMM) {
         /* Fit this constant in by commuting the operands.  Exception: we
-         * can't do this for 32-bit integer MUL because it's asymmetric.
+         * can't do this for 32-bit integer MUL/MACH because it's asymmetric.
          */
-        if (inst->opcode == BRW_OPCODE_MUL &&
+        if ((inst->opcode == BRW_OPCODE_MUL ||
+              inst->opcode == BRW_OPCODE_MACH) &&
             (inst->src[1].type == BRW_REGISTER_TYPE_D ||
              inst->src[1].type == BRW_REGISTER_TYPE_UD))
            break;
@@ -160,8 +162,7 @@ try_constant_propagation(vec4_instruction *inst, int arg, src_reg *values[4])
 }
 
 bool
-vec4_visitor::try_copy_propagation(struct intel_context *intel,
-                                   vec4_instruction *inst, int arg,
+vec4_visitor::try_copy_propagation(vec4_instruction *inst, int arg,
                                    src_reg *values[4])
 {
    /* For constant propagation, we only handle the same constant
@@ -205,17 +206,20 @@ vec4_visitor::try_copy_propagation(struct intel_context *intel,
    if (inst->src[arg].negate)
       value.negate = !value.negate;
 
-   bool has_source_modifiers = (value.negate || value.abs ||
-                                value.swizzle != BRW_SWIZZLE_XYZW ||
-                                value.file == UNIFORM);
+   bool has_source_modifiers = value.negate || value.abs;
 
    /* gen6 math and gen7+ SENDs from GRFs ignore source modifiers on
     * instructions.
     */
-   if (has_source_modifiers && !can_do_source_mods(inst))
+   if ((has_source_modifiers || value.file == UNIFORM ||
+        value.swizzle != BRW_SWIZZLE_XYZW) && !can_do_source_mods(inst))
+      return false;
+
+   if (has_source_modifiers && value.type != inst->src[arg].type)
       return false;
 
    bool is_3src_inst = (inst->opcode == BRW_OPCODE_LRP ||
+                        inst->opcode == BRW_OPCODE_MAD ||
                         inst->opcode == BRW_OPCODE_BFE ||
                         inst->opcode == BRW_OPCODE_BFI2);
    if (is_3src_inst && value.file == UNIFORM)
@@ -303,7 +307,7 @@ vec4_visitor::opt_copy_propagation()
            continue;
 
         if (try_constant_propagation(inst, i, values) ||
-            try_copy_propagation(intel, inst, i, values))
+            try_copy_propagation(inst, i, values))
            progress = true;
       }