aboutsummaryrefslogtreecommitdiffstats
path: root/include/EGL/eglplatform.h
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-09-04 13:19:32 +0100
committerEric Engestrom <[email protected]>2019-10-07 20:28:59 +0000
commit6202a13b71e18dc31ba7e2f4ea915b67eacc1ddb (patch)
tree6ba8a334114cd19830334d4ab43862fb76f767d9 /include/EGL/eglplatform.h
parent90a35752b48626d9f8c7abcb34e87ac779dbdff0 (diff)
egl: replace MESA_EGL_NO_X11_HEADERS hack with upstream EGL_NO_X11
Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Daniel Stone <[email protected]>
Diffstat (limited to 'include/EGL/eglplatform.h')
-rw-r--r--include/EGL/eglplatform.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
index 4876dbd46be..939539e640e 100644
--- a/include/EGL/eglplatform.h
+++ b/include/EGL/eglplatform.h
@@ -55,6 +55,12 @@
#endif
#define EGLAPIENTRYP EGLAPIENTRY*
+#if defined(MESA_EGL_NO_X11_HEADERS) && !defined(EGL_NO_X11)
+#warning "`MESA_EGL_NO_X11_HEADERS` is deprecated, and doesn't work with the unmodified Khronos header"
+#warning "Please use `EGL_NO_X11` instead, as `MESA_EGL_NO_X11_HEADERS` will be removed soon"
+#define EGL_NO_X11
+#endif
+
/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
* are aliases of window-system-dependent types, such as X Display * or
* Windows Device Context. They must be defined in platform-specific
@@ -116,15 +122,13 @@ typedef intptr_t EGLNativeDisplayType;
typedef intptr_t EGLNativePixmapType;
typedef intptr_t EGLNativeWindowType;
-#elif defined(__unix__) || defined(__APPLE__)
+#elif defined(__unix__) && defined(EGL_NO_X11)
-#if defined(MESA_EGL_NO_X11_HEADERS)
-
-typedef void *EGLNativeDisplayType;
+typedef void *EGLNativeDisplayType;
typedef khronos_uintptr_t EGLNativePixmapType;
typedef khronos_uintptr_t EGLNativeWindowType;
-#else
+#elif defined(__unix__) || defined(USE_X11)
/* X11 (tentative) */
#include <X11/Xlib.h>
@@ -134,7 +138,11 @@ typedef Display *EGLNativeDisplayType;
typedef Pixmap EGLNativePixmapType;
typedef Window EGLNativeWindowType;
-#endif /* MESA_EGL_NO_X11_HEADERS */
+#elif defined(__APPLE__)
+
+typedef int EGLNativeDisplayType;
+typedef void *EGLNativePixmapType;
+typedef void *EGLNativeWindowType;
#elif defined(__HAIKU__)