[Mesa-dev] [PATCH v2 04/12] mesa: glGet: fix API check for EGL_image_external enums

[Brian Paul]

On 09/10/2012 12:41 AM, Imre Deak wrote:
> 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 at intel.com>
> ---
>   src/mesa/main/get.c |   15 +++++++++------
>   1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
> index ce5af04..6800cc3 100644
> --- a/src/mesa/main/get.c
> +++ b/src/mesa/main/get.c
> @@ -789,6 +789,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 },

BTW, what are these { 0, ... } entries for?  I see there's several of 
them but no comments about what they're for.


> +   /* 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 },
> @@ -801,12 +810,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 },


Reviewed-by: Brian Paul <brianp at vmware.com>