Now that can_do_source_mods() isn't part of the visitor, this doesn't
need to be either.
---
src/mesa/drivers/dri/i965/brw_vec4.h | 3 ---
src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp | 8 ++++----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h
b/src/mesa/drivers/dri/i965/brw_vec4.h
index 554e045..366198c 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.h
+++ b/src/mesa/drivers/dri/i965/brw_vec4.h
@@ -496,9 +496,6 @@ public:
vec4_instruction *pre_rhs_inst,
vec4_instruction *last_rhs_inst);
- bool try_copy_propagate(vec4_instruction *inst, int arg,
- src_reg *values[4]);
-
/** Walks an exec_list of ir_instruction and sends it through this visitor.
*/
void visit_instructions(const exec_list *list);
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 d992a86..2019d15 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp
@@ -211,9 +211,9 @@ is_logic_op(enum opcode opcode)
opcode == BRW_OPCODE_NOT);
}
-bool
-vec4_visitor::try_copy_propagate(vec4_instruction *inst, int arg,
- src_reg *values[4])
+static bool
+try_copy_propagate(struct brw_context *brw, vec4_instruction *inst,
+ int arg, src_reg *values[4])
{
/* For constant propagation, we only handle the same constant
* across all 4 channels. Some day, we should handle the 8-bit
@@ -368,7 +368,7 @@ vec4_visitor::opt_copy_propagation()
continue;
if (try_constant_propagate(brw, inst, i, values) ||
- try_copy_propagate(inst, i, values))
+ try_copy_propagate(brw, inst, i, values))
progress = true;
}
--
1.8.3.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
