From: Francisco Jerez <currojerez@riseup.net>
Date: Sun, 16 Aug 2015 22:39:38 +0000 (+0300)
Subject: glsl: Remove duplicate definition of gl_MaxTess*ImageUniforms built-in constants.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a976b7255b2c84e6cccefb447029add02ddf86ae;p=mesa.git

glsl: Remove duplicate definition of gl_MaxTess*ImageUniforms built-in constants.

These seem to have been re-added at some point during the
ARB_tessellation_shader implementation work.  AFAICT the second
(correct) definition of each constant would have had no effect because
the symbols were already defined.

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
---

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index c6fdccfd721..4966ba3ff4e 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -754,8 +754,6 @@ builtin_variable_generator::generate_constants()
                 state->Const.MaxImageSamples);
       add_const("gl_MaxVertexImageUniforms",
                 state->Const.MaxVertexImageUniforms);
-      add_const("gl_MaxTessControlImageUniforms", 0);
-      add_const("gl_MaxTessEvaluationImageUniforms", 0);
       add_const("gl_MaxGeometryImageUniforms",
                 state->Const.MaxGeometryImageUniforms);
       add_const("gl_MaxFragmentImageUniforms",