From: Matt Turner Date: Tue, 24 Jun 2014 05:16:02 +0000 (-0700) Subject: i965/vec4: Make try_copy_propagate() static. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d5432e3f45ee3c5b5b824ad941a40c01025a275d;p=mesa.git i965/vec4: Make try_copy_propagate() static. Now that can_do_source_mods() isn't part of the visitor, this doesn't need to be either. Reviewed-by: Kenneth Graunke --- diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 554e0450e71..366198c115f 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 d992a864fc1..2019d157df9 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; }