isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Just define the needed GLES2 extension ourself

Browse Source 
We need a GLES2 extension macro in cogl-texture-2d-gl.c, but we can't
include GLES2/gl2ext.h because it will conflict with things in
GL/glext.h. We can't rely on cogl including anything for us since it'd
only include GLES2/gl2ext.h if OpenGL support was explicitly disabled.

https://bugzilla.gnome.org/show_bug.cgi?id=774891
This commit is contained in:
Jonas Ådahl 2016-12-09 11:54:38 +08:00
parent 81b11929f7
commit 5a43cc5cf9
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,14 +47,19 @@
#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 "cogl-egl-defines.h"
# ifndef COGL_HAS_GLES2
/* We need this define from GLES2, but can't include the header /* We need this define from GLES2, but can't include the header
as its type definitions may conflict with the GL ones as its type definitions may conflict with the GL ones
*/ */
#ifndef GL_OES_EGL_image_external
#define GL_OES_EGL_image_external 1
#define GL_TEXTURE_EXTERNAL_OES 0x8D65 #define GL_TEXTURE_EXTERNAL_OES 0x8D65
# endif #define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67
#endif #define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68
#define GL_SAMPLER_EXTERNAL_OES 0x8D66
#endif /* GL_OES_EGL_image_external */
#endif /* defined (COGL_HAS_EGL_SUPPORT) */
void void
_cogl_texture_2d_gl_free (CoglTexture2D *tex_2d) _cogl_texture_2d_gl_free (CoglTexture2D *tex_2d)