diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2011-10-03 14:28:43 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-11-10 10:21:14 -0800 |
| commit | 6b151886fdbb74a5b92c9ff9e36fc0365c8ef8c5 (patch) | |
| tree | 39f9ddcb2b18d0e2bc527519c4a2eb40128e9530 | |
| parent | 436db5df9c193b4849afd37ce7e1697274ca25d8 (diff) | |
| download | mesa-6b151886fdbb74a5b92c9ff9e36fc0365c8ef8c5.tar.gz | |
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@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 5785cd2bf50f38290540bbf805a41294d213db3a)
| -rw-r--r-- | 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 13f416a85fb..1cfaf269795 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 }, |