summaryrefslogtreecommitdiff
path: root/cogl/cogl-context.h
diff options
context:
space:
mode:
authorDamien Lespiau <damien.lespiau@intel.com>2011-05-13 08:04:47 +0100
committerDamien Lespiau <damien.lespiau@intel.com>2011-05-17 15:24:54 +0100
commitdd5a1c888b68e3d8a4f41212cb257c1e8dc3833b (patch)
treee124c0f4361492102868d3e49b5272b1f6327dfc /cogl/cogl-context.h
parent1d6c6f0dad79e73fa719eb4b91d0f6455f6d921c (diff)
downloadcogl-dd5a1c888b68e3d8a4f41212cb257c1e8dc3833b.tar.gz
gles1: Include GLES/egl.h or EGL/egl.h depending on the implementation
Early implementations provided only a GLES/egl.h while Khronos's implementer guide now states EGL/egl.h is the One. Some implementations keep a GLES/egl.h wrapper around EGL/egl.h for backward compatibility while others provide EGL/egl.h only. Also took the opportunity to factorize a bit this inclusion in cogl-defines.h.
Diffstat (limited to 'cogl/cogl-context.h')
-rw-r--r--cogl/cogl-context.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/cogl/cogl-context.h b/cogl/cogl-context.h
index 7cd0785d..bce47f1f 100644
--- a/cogl/cogl-context.h
+++ b/cogl/cogl-context.h
@@ -31,19 +31,9 @@
#ifndef __COGL_CONTEXT_H__
#define __COGL_CONTEXT_H__
+#include <cogl/cogl-defines.h>
#include <cogl/cogl-display.h>
-#ifdef COGL_HAS_EGL_SUPPORT
-#ifdef COGL_HAS_GLES1
-#include <GLES/gl.h>
-#include <GLES/egl.h>
-#else
-#include <EGL/egl.h>
-#define NativeDisplayType EGLNativeDisplayType
-#define NativeWindowType EGLNativeWindowType
-#endif
-#endif
-
G_BEGIN_DECLS
/**