isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Do not include both GLES2 and GL headers

Browse Source 
EGLDevice requires a define from GLES2, even when GL is used instead.
As type definitions may conflict between the two, we shouldn't include
both at the same time. Instead, provide the missing define explicitly
when not using GLES2.

https://bugzilla.gnome.org/show_bug.cgi?id=774891
This commit is contained in:
Florian Müllner 2016-12-02 14:07:08 +01:00
parent 5eb5f72434
commit 71077d582b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cogl/cogl/driver/gl/cogl-texture-2d-gl.c
View File

@ -47,8 +47,13 @@
#include "cogl-util-gl-private.h" #include "cogl-util-gl-private.h"
#if defined (COGL_HAS_EGL_SUPPORT) #if defined (COGL_HAS_EGL_SUPPORT)
#include <GLES2/gl2.h> #include "cogl-egl-defines.h"
#include <GLES2/gl2ext.h> # ifndef COGL_HAS_GLES2
/* We need this define from GLES2, but can't include the header
as its type definitions may conflict with the GL ones
*/
# define GL_TEXTURE_EXTERNAL_OES 0x8D65
# endif
#endif #endif
void void