Mesa (7.11): mesa/get: Move MAX_LIGHTS from GL/ES2 to GL/ES1.

[Ian Romanick]

Module: Mesa
Branch: 7.11
Commit: 6b151886fdbb74a5b92c9ff9e36fc0365c8ef8c5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b151886fdbb74a5b92c9ff9e36fc0365c8ef8c5

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Oct  3 14:28:43 2011 -0700

mesa/get: Move MAX_LIGHTS from GL/ES2 to GL/ES1.

It's required for ES 1.0 and 1.1, and isn't specified for ES 2.

While the comment says Mesa depends on it internally, removing it from
ES2 doesn't seem to regress any Piglit or ES2 conformance tests.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 5785cd2bf50f38290540bbf805a41294d213db3a)

---

 src/mesa/main/get.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 13f416a..1cfaf26 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -509,6 +509,7 @@ static const struct value_desc values[] = {
 #if FEATURE_GL || FEATURE_ES1
    /* Enums in OpenGL and GLES1 */
    { 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGLES_BIT, NO_EXTRA },
+   { GL_MAX_LIGHTS, CONTEXT_INT(Const.MaxLights), NO_EXTRA },
    { GL_LIGHT0, CONTEXT_BOOL(Light.Light[0].Enabled), NO_EXTRA },
    { GL_LIGHT1, CONTEXT_BOOL(Light.Light[1].Enabled), NO_EXTRA },
    { GL_LIGHT2, CONTEXT_BOOL(Light.Light[2].Enabled), NO_EXTRA },
@@ -677,8 +678,6 @@ static const struct value_desc values[] = {
 
 #if FEATURE_GL || FEATURE_ES2
    { 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGLES2_BIT, NO_EXTRA },
-   /* This entry isn't spec'ed for GLES 2, but is needed for Mesa's GLSL: */
-   { GL_MAX_LIGHTS, CONTEXT_INT(Const.MaxLights), NO_EXTRA },
    { GL_MAX_TEXTURE_COORDS_ARB, /* == GL_MAX_TEXTURE_COORDS_NV */
      CONTEXT_INT(Const.MaxTextureCoordUnits),
      extra_ARB_fragment_program_NV_fragment_program },