fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa: glGet: fix API check for EGL_image_external enums

Browse source 
These enums are valid only in ES1 and ES2. So far they were marked valid
incorrectly, depending on the previous API mask in the enum list.

Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
This commit is contained in:
Imre Deak 2012-09-10 09:41:40 +03:00 • committed by Oliver McFadden
parent dee121b885
commit b4419477fb
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/main/get.c
View file

@ -791,6 +791,15 @@ static const struct value_desc values[] = {
#endif /* FEATURE_GL || FEATURE_ES2 */
#if FEATURE_ES1 || FEATURE_ES2
{ 0, 0, TYPE_API_MASK, API_OPENGLES | API_OPENGLES2_BIT, NO_EXTRA },
/* GL_OES_EGL_image_external */
{ GL_TEXTURE_BINDING_EXTERNAL_OES, LOC_CUSTOM,
TYPE_INT, TEXTURE_EXTERNAL_INDEX, extra_OES_EGL_image_external },
{ GL_TEXTURE_EXTERNAL_OES, LOC_CUSTOM,
TYPE_BOOLEAN, 0, extra_OES_EGL_image_external },
#endif
#if FEATURE_ES2
/* Enums unique to OpenGL ES 2.0 */
{ 0, 0, TYPE_API_MASK, API_OPENGLES2_BIT, NO_EXTRA },
@ -803,12 +812,6 @@ static const struct value_desc values[] = {
{ GL_SHADER_BINARY_FORMATS, CONST(0), NO_EXTRA },
#endif /* FEATURE_ES2 */
/* GL_OES_EGL_image_external */
{ GL_TEXTURE_BINDING_EXTERNAL_OES, LOC_CUSTOM,
TYPE_INT, TEXTURE_EXTERNAL_INDEX, extra_OES_EGL_image_external },
{ GL_TEXTURE_EXTERNAL_OES, LOC_CUSTOM,
TYPE_BOOLEAN, 0, extra_OES_EGL_image_external },
#if FEATURE_GL
/* Remaining enums are only in OpenGL */
{ 0, 0, TYPE_API_MASK, API_OPENGL_BIT | API_OPENGL_CORE_BIT, NO_EXTRA },