From 7526df70ea249c26332c35017f7a810332b2deee Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Mon, 23 Jun 2014 22:12:03 -0700 Subject: [PATCH] i965/vec4: Rename try_copy/constant_propagat{ion,e} to match the fs. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_vec4.h | 4 ++-- .../drivers/dri/i965/brw_vec4_copy_propagation.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 366ef02a510..554e0450e71 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -496,8 +496,8 @@ public: vec4_instruction *pre_rhs_inst, vec4_instruction *last_rhs_inst); - bool try_copy_propagation(vec4_instruction *inst, int arg, - src_reg *values[4]); + 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 278ec7b3601..d992a864fc1 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_copy_propagation.cpp @@ -73,8 +73,8 @@ is_channel_updated(vec4_instruction *inst, src_reg *values[4], int ch) } static bool -try_constant_propagation(struct brw_context *brw, vec4_instruction *inst, - int arg, src_reg *values[4]) +try_constant_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 @@ -212,8 +212,8 @@ is_logic_op(enum opcode opcode) } bool -vec4_visitor::try_copy_propagation(vec4_instruction *inst, int arg, - src_reg *values[4]) +vec4_visitor::try_copy_propagate(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 @@ -367,8 +367,8 @@ vec4_visitor::opt_copy_propagation() if (c != 4) continue; - if (try_constant_propagation(brw, inst, i, values) || - try_copy_propagation(inst, i, values)) + if (try_constant_propagate(brw, inst, i, values) || + try_copy_propagate(inst, i, values)) progress = true; } -- 2.30.2