i965/fs: Rename register_coalesce_2() -> register_coalesce().

Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index ad1323ca494cce36306989a6ee44e9c031a8d609..2d41c3fc19f2d521ea5f94854f1f9c7df52ddd6d 100644 (file)
--- 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 12a7576da76d3f9c7ca186679614f4f252aefb4d..be87e59a98e820a45f8d8bb1a50d7dd13c111f07 100644 (file)
--- 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();