From aa881e4dc06c2efbf0c993798bcee9c880a7f66f Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 20 Oct 2016 09:55:11 +1100 Subject: [PATCH] glsl: remove now unused InterpQualifier Reviewed-by: Jason Ekstrand --- 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 f5b36df680d..baa52b18057 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 200a7afb1e0..545a8d2ca14 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2004,13 +2004,6 @@ struct gl_fragment_program GLboolean PixelCenterInteger; 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.30.2