From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 29 Mar 2016 19:11:55 +0000 (-0700)
Subject: glsl: Delete hack for VS system values.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6e8b9d5bdd200a8e65cdefe1d2f97bacc5a2c63d;p=mesa.git

glsl: Delete hack for VS system values.

This makes no sense.  If the stage being considered is the vertex
shader, then we'll add inputs and system values appropriately.

If we're not considering the vertex shader, then we absolutely should
not do anything with it.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
---

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index a8d9cf4ce2a..0005d4965e1 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -3541,10 +3541,6 @@ add_interface_variables(struct gl_shader_program *shProg,
              var->data.location != SYSTEM_VALUE_VERTEX_ID_ZERO_BASE &&
              var->data.location != SYSTEM_VALUE_INSTANCE_ID)
             continue;
-         /* Mark special built-in inputs referenced by the vertex stage so
-          * that they are considered active by the shader queries.
-          */
-         stages = (1 << (MESA_SHADER_VERTEX));
          /* FALLTHROUGH */
       case ir_var_shader_in:
          if (programInterface != GL_PROGRAM_INPUT)