diff options
| author | Brian Paul <brianp@vmware.com> | 2018-08-06 09:32:10 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2018-08-08 08:20:01 -0600 |
| commit | 6ff4795c622762d6498c73b407070f9c6157878e (patch) | |
| tree | aff45470d951cd62656b90e48563ed93f5969dec /include | |
| parent | 32aa7ff647be3c45317e66ca611443d21df52f93 (diff) | |
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 <vlee@freedesktop.org>
Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/gl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index f5bac3670a0..d4475db362f 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 |