[Mesa-dev] [PATCH] gl.h: define GLeglImageOES depending on GL_EXT_EGL_image_storage

[Mathias Fröhlich]

Good morning,

Looks good to me

Reviewed-by: Mathias Fröhlich <mathias.froehlich at web.de>

best
Mathias

On Tuesday, 7 August 2018 17:25:38 CEST Brian Paul wrote:
> To avoid duplicate typedef with the definition in glext.h
> 
> V2: test for both GL_OES_EGL_image and GL_EXT_EGL_image_storage in
> case both the GL and GLES headers are included.  Per Emil.
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107488
> Tested-by: Vinson Lee <vlee at freedesktop.org>
> ---
>  include/GL/gl.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/GL/gl.h b/include/GL/gl.h
> index f5bac36..d4475db 100644
> --- a/include/GL/gl.h
> +++ b/include/GL/gl.h
> @@ -2086,7 +2086,7 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen
>  
>  
>  /* GL_OES_EGL_image */
> -#ifndef GL_OES_EGL_image
> +#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage)
>  typedef void* GLeglImageOES;
>  #endif
>  
>