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

Include cogl/cogl-egl.h from clutter-egl-headers.h

Browse Source 
Since Cogl version 1.11.2, Cogl no longer includes the EGL headers
from cogl.h if COGL_ENABLE_EXPERIMENTAL_2_0_API is defined. Instead
the application needs to include cogl-egl.h so that we can avoid
polluting the global namespace with X defines. Clutter defines the 2.0
define in its configure.ac and it is relying on Cogl to include the
right EGL header in clutter-egl-headers.h so we need to change which
header it includes.
This commit is contained in:
Neil Roberts 2012-09-03 15:11:22 +01:00
parent 03f4f1c69e
commit cda4493f99
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clutter/egl/clutter-egl-headers.h
View File

@ -25,6 +25,17 @@
/* Clutter relies on Cogl to abstract GLES1/2/OpenGL and GLX/EGL etc /* Clutter relies on Cogl to abstract GLES1/2/OpenGL and GLX/EGL etc
* so we simply include the Cogl header to pull in the appropriate EGL * so we simply include the Cogl header to pull in the appropriate EGL
* header. */ * header. */
#include <cogl/cogl.h> #include <cogl/cogl.h>
/* Since Cogl 1.11.2, the EGL headers are no longer included from
* cogl.h when the experimental 2.0 API is requested. Clutter requests
* this in its configure script so we need to switch the header we
* include in that case. COGL_VERSION_CHECK is also new in 1.11.2 */
#ifdef COGL_VERSION_CHECK
#if COGL_VERSION_CHECK (1, 11, 2)
#include <cogl/cogl-egl.h>
#endif
#endif
#endif /* __CLUTTER_EGL_HEADERS_H__ */ #endif /* __CLUTTER_EGL_HEADERS_H__ */