From: Matt Turner <mattst88@gmail.com>
Date: Thu, 27 Mar 2014 18:35:49 +0000 (-0700)
Subject: i965/fs: Remove left-over 'removed' variable.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5c770ba919723bb1c5d168717e814cca4a68e877;p=mesa.git

i965/fs: Remove left-over 'removed' variable.

I think this was used for coalescing out partly dead large virtual
registers, but the patch that enabled that caused regressions and didn't
make it upstream.

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

diff --git a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
index c71fd47bbe7..6e30d16816d 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_register_coalesce.cpp
@@ -169,11 +169,8 @@ fs_visitor::register_coalesce()
       if (!can_coalesce)
          continue;
 
-      bool removed = false;
       for (int i = 0; i < src_size; i++) {
          if (mov[i]) {
-            removed = true;
-
             mov[i]->opcode = BRW_OPCODE_NOP;
             mov[i]->conditional_mod = BRW_CONDITIONAL_NONE;
             mov[i]->dst = reg_undef;
@@ -206,17 +203,15 @@ fs_visitor::register_coalesce()
          }
       }
 
-      if (removed) {
-         for (int i = 0; i < src_size; i++) {
-            live_intervals->start[var_to[i]] =
-               MIN2(live_intervals->start[var_to[i]],
-                    live_intervals->start[var_from[i]]);
-            live_intervals->end[var_to[i]] =
-               MAX2(live_intervals->end[var_to[i]],
-                    live_intervals->end[var_from[i]]);
-            reg_from = -1;
-         }
+      for (int i = 0; i < src_size; i++) {
+         live_intervals->start[var_to[i]] =
+            MIN2(live_intervals->start[var_to[i]],
+                 live_intervals->start[var_from[i]]);
+         live_intervals->end[var_to[i]] =
+            MAX2(live_intervals->end[var_to[i]],
+                 live_intervals->end[var_from[i]]);
       }
+      reg_from = -1;
    }
 
    foreach_list_safe(node, &this->instructions) {