From: Eric Anholt <eric@anholt.net>
Date: Tue, 6 May 2014 22:19:55 +0000 (-0700)
Subject: i965: Stop doing remapping of "special" regs.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=afe3d155;p=mesa.git

i965: Stop doing remapping of "special" regs.

Now that we aren't using pixel_[xy] in live variables, nothing is looking
at these regs after the visitor stage.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index c550c412229..6b1b866fcc7 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -1740,34 +1740,6 @@ fs_visitor::compact_virtual_grfs()
       }
    }
 
-   /* In addition to registers used in instructions, fs_visitor keeps
-    * direct references to certain special values which must be patched:
-    */
-   struct {
-      fs_reg *reg;
-      unsigned count;
-   } special[] = {
-      { &frag_depth, 1 },
-      { &pixel_x, 1 },
-      { &pixel_y, 1 },
-      { &pixel_w, 1 },
-      { &wpos_w, 1 },
-      { &dual_src_output, 1 },
-      { outputs, ARRAY_SIZE(outputs) },
-      { delta_x, ARRAY_SIZE(delta_x) },
-      { delta_y, ARRAY_SIZE(delta_y) },
-      { &sample_mask, 1 },
-      { &shader_start_time, 1 },
-   };
-
-   /* Treat all special values as used, to be conservative */
-   for (unsigned i = 0; i < ARRAY_SIZE(special); i++) {
-      for (unsigned j = 0; j < special[i].count; j++) {
-         if (special[i].reg[j].file == GRF)
-            remap_table[special[i].reg[j].reg] = 0;
-      }
-   }
-
    /* Compact the GRF arrays. */
    int new_index = 0;
    for (int i = 0; i < this->virtual_grf_count; i++) {
@@ -1793,15 +1765,6 @@ fs_visitor::compact_virtual_grfs()
             inst->src[i].reg = remap_table[inst->src[i].reg];
       }
    }
-
-   /* Patch all the references to special values */
-   for (unsigned i = 0; i < ARRAY_SIZE(special); i++) {
-      for (unsigned j = 0; j < special[i].count; j++) {
-         fs_reg *reg = &special[i].reg[j];
-         if (reg->file == GRF && remap_table[reg->reg] != -1)
-            reg->reg = remap_table[reg->reg];
-      }
-   }
 }
 
 /*