[Mesa-dev] [PATCH 30/42] glsl: remove now unused InterpQualifier

[Timothy Arceri]

---
 src/compiler/glsl/ir_set_program_inouts.cpp | 7 ++-----
 src/mesa/main/mtypes.h                      | 7 -------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/compiler/glsl/ir_set_program_inouts.cpp b/src/compiler/glsl/ir_set_program_inouts.cpp
index f5b36df..baa52b1 100644
--- a/src/compiler/glsl/ir_set_program_inouts.cpp
+++ b/src/compiler/glsl/ir_set_program_inouts.cpp
@@ -26,8 +26,8 @@
  *
  * Sets the InputsRead and OutputsWritten of Mesa programs.
  *
- * Additionally, for fragment shaders, sets the InterpQualifier array, and the
- * IsCentroid and IsSample bitfields.
+ * Additionally, for fragment shaders, sets the IsCentroid and IsSample
+ * bitfields.
  *
  * Mesa programs (gl_program, not gl_shader_program) have a set of
  * flags indicating which varyings are read and written.  Computing
@@ -125,8 +125,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;
-            fprog->InterpQualifier[idx] =
-               (glsl_interp_mode) var->data.interpolation;
             if (var->data.centroid)
                fprog->IsCentroid |= bitfield;
             if (var->data.sample)
@@ -445,7 +443,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;
-      memset(fprog->InterpQualifier, 0, sizeof(fprog->InterpQualifier));
       fprog->IsCentroid = 0;
       fprog->IsSample = 0;
       fprog->UsesKill = false;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 75c9bae..52b9491 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2005,13 +2005,6 @@ struct gl_fragment_program
    enum gl_frag_depth_layout FragDepthLayout;
 
    /**
-    * GLSL interpolation qualifier associated with each fragment shader input.
-    * For inputs that do not have an interpolation qualifier specified in
-    * GLSL, the value is INTERP_MODE_NONE.
-    */
-   enum glsl_interp_mode InterpQualifier[VARYING_SLOT_MAX];
-
-   /**
     * Bitfield indicating, for each fragment shader input, 1 if that input
     * uses centroid interpolation, 0 otherwise.  Unused inputs are 0.
     */
-- 
2.7.4