From 04d83396eef7a8c8603f55bc0a0b04c80a9f6cf5 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 29 Nov 2013 22:16:14 -0800 Subject: [PATCH] i965/fs: Rename register_coalesce_2() -> register_coalesce(). Reviewed-by: Eric Anholt --- src/mesa/drivers/dri/i965/brw_fs.cpp | 10 +++++----- src/mesa/drivers/dri/i965/brw_fs.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp index ad1323ca494..2d41c3fc19f 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp @@ -2241,12 +2241,12 @@ fs_visitor::dead_code_eliminate_local() } /** - * Implements a second type of register coalescing: This one checks if - * the two regs involved in a raw move don't interfere, in which case - * they can both by stored in the same place and the MOV removed. + * Implements register coalescing: Checks if the two registers involved in a + * raw move don't interfere, in which case they can both be stored in the same + * place and the MOV removed. */ bool -fs_visitor::register_coalesce_2() +fs_visitor::register_coalesce() { bool progress = false; @@ -3125,7 +3125,7 @@ fs_visitor::run() progress = dead_code_eliminate() || progress; progress = dead_code_eliminate_local() || progress; progress = dead_control_flow_eliminate(this) || progress; - progress = register_coalesce_2() || progress; + progress = register_coalesce() || progress; progress = compute_to_mrf() || progress; } while (progress); diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h index 12a7576da76..be87e59a98e 100644 --- a/src/mesa/drivers/dri/i965/brw_fs.h +++ b/src/mesa/drivers/dri/i965/brw_fs.h @@ -314,7 +314,7 @@ public: bool try_constant_propagate(fs_inst *inst, acp_entry *entry); bool opt_copy_propagate_local(void *mem_ctx, bblock_t *block, exec_list *acp); - bool register_coalesce_2(); + bool register_coalesce(); bool compute_to_mrf(); bool dead_code_eliminate(); bool dead_code_eliminate_local(); -- 2.30.2