[Mesa-dev] [PATCH 34/42] mesa: remove now unused IsCentroid from gl_fragment_program

[Timothy Arceri]

---
 src/compiler/glsl/ir_set_program_inouts.cpp | 6 +-----
 src/mesa/main/mtypes.h                      | 6 ------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp
index baa52b1..a177219 100644
--- a/src/compiler/glsl/ir_set_program_inouts.cpp
+++ b/src/compiler/glsl/ir_set_program_inouts.cpp
@@ -26,8 +26,7 @@
  *
  * Sets the InputsRead and OutputsWritten of Mesa programs.
  *
- * Additionally, for fragment shaders, sets the IsCentroid and IsSample
- * bitfields.
+ * Additionally, for fragment shaders, set the IsSample bitfield.
  *
  * Mesa programs (gl_program, not gl_shader_program) have a set of
  * flags indicating which varyings are read and written.  Computing
@@ -125,8 +124,6 @@ mark(struct gl_program *prog, ir_variable *var, int offset, int len,
 
          if (stage == MESA_SHADER_FRAGMENT) {
             gl_fragment_program *fprog = (gl_fragment_program *) prog;
-            if (var->data.centroid)
-               fprog->IsCentroid |= bitfield;
             if (var->data.sample)
                fprog->IsSample |= bitfield;
          }
@@ -443,7 +440,6 @@ do_set_program_inouts(exec_list *instructions, struct gl_program *prog,
    prog->SystemValuesRead = 0;
    if (shader_stage == MESA_SHADER_FRAGMENT) {
       gl_fragment_program *fprog = (gl_fragment_program *) prog;
-      fprog->IsCentroid = 0;
       fprog->IsSample = 0;
       fprog->UsesKill = false;
    }
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 52b9491..4ab6ebe 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2006,12 +2006,6 @@ struct gl_fragment_program
 
    /**
     * Bitfield indicating, for each fragment shader input, 1 if that input
-    * uses centroid interpolation, 0 otherwise.  Unused inputs are 0.
-    */
-   GLbitfield64 IsCentroid;
-
-   /**
-    * Bitfield indicating, for each fragment shader input, 1 if that input
     * uses sample interpolation, 0 otherwise.  Unused inputs are 0.
     */
    GLbitfield64 IsSample;
-- 
2.7.4