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

renderer-native-gles3: Add cpp error if gl.h was included

Browse Source 
On some architectures, including both GLES3/gl3.h GL/gl.h will cause
compilation issues due to incompatible type definitions. To avoid
running into that issue while building on other architectures, make
sure we haven't included GL/gl.h by accident.

https://bugzilla.gnome.org/show_bug.cgi?id=788695
This commit is contained in:
Jonas Ådahl 2017-10-30 16:08:46 +08:00
parent fb3a64491e
commit 626621a53a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backends/native/meta-renderer-native-gles3.c
View File

@ -34,6 +34,14 @@
#include "backends/meta-gles3.h" #include "backends/meta-gles3.h"
#include "backends/meta-gles3-table.h" #include "backends/meta-gles3-table.h"
/*
* GL/gl.h being included may conflit with gl3.h on some architectures.
* Make sure that hasn't happened on any architecture.
*/
#ifdef GL_VERSION_1_1
#error "Somehow included OpenGL headers when we shouldn't have"
#endif
static EGLImageKHR static EGLImageKHR
create_egl_image (MetaEgl *egl, create_egl_image (MetaEgl *egl,
EGLDisplay egl_display, EGLDisplay egl_display,