Module: Mesa Branch: master Commit: 6ff4795c622762d6498c73b407070f9c6157878e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ff4795c622762d6498c73b407070f9c6157878e
Author: Brian Paul <[email protected]> Date: Mon Aug 6 09:32:10 2018 -0600 gl.h: define GLeglImageOES depending on GL_EXT_EGL_image_storage 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 <[email protected]> Reviewed-by: Mathias Fröhlich <[email protected]> --- 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 f5bac3670a..d4475db362 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 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
