From: Emil Velikov <emil.veli...@collabora.com> This commit effectively reverts the following:
7d642442d9339e5b65c30802c44091816cdf18be 400b833592d9aad7b2c4627a897380642d52189f 2c6186390c48e0d1f2b4d4136c11eb0bedfd1aec eddcecbf74da26716509c047b95e85b00c12bab4 c0f8c9911c82c576cdd82dabad4a2370ac53565c 04c5cc5b8bec1f34f2405b08fd0d9ed6bd70ea61 985c2fca10b9338ef894cf8d34877dfbe7468e6e Any user should effectively set the respective macro/define in order to use the appropriate native types. --- IMHO this is something we want in the long term. Not sure how applicable/possible it would be to achieve w/o breaking the build for existing apps. --- include/EGL/eglplatform.h | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h index dc4a3e2..9ad874b 100644 --- a/include/EGL/eglplatform.h +++ b/include/EGL/eglplatform.h @@ -147,24 +147,12 @@ typedef HDC EGLNativeDisplayType; typedef HBITMAP EGLNativePixmapType; typedef HWND EGLNativeWindowType; -#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ +#elif defined(__APPLE__) || defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ typedef int EGLNativeDisplayType; typedef void *EGLNativeWindowType; typedef void *EGLNativePixmapType; -#elif defined(WL_EGL_PLATFORM) - -typedef struct wl_display *EGLNativeDisplayType; -typedef struct wl_egl_pixmap *EGLNativePixmapType; -typedef struct wl_egl_window *EGLNativeWindowType; - -#elif defined(__GBM__) - -typedef struct gbm_device *EGLNativeDisplayType; -typedef struct gbm_bo *EGLNativePixmapType; -typedef void *EGLNativeWindowType; - #elif defined(__ANDROID__) || defined(ANDROID) #include <android/native_window.h> @@ -175,15 +163,7 @@ typedef struct ANativeWindow* EGLNativeWindowType; typedef struct egl_native_pixmap_t* EGLNativePixmapType; typedef void* EGLNativeDisplayType; -#elif defined(__unix__) || defined(__APPLE__) - -#if defined(MESA_EGL_NO_X11_HEADERS) - -typedef void *EGLNativeDisplayType; -typedef khronos_uintptr_t EGLNativePixmapType; -typedef khronos_uintptr_t EGLNativeWindowType; - -#else +#elif defined(__unix__) /* X11 (tentative) */ #include <X11/Xlib.h> @@ -193,14 +173,6 @@ typedef Display *EGLNativeDisplayType; typedef Pixmap EGLNativePixmapType; typedef Window EGLNativeWindowType; -#endif /* MESA_EGL_NO_X11_HEADERS */ - -#elif __HAIKU__ -#include <kernel/image.h> -typedef void *EGLNativeDisplayType; -typedef khronos_uintptr_t EGLNativePixmapType; -typedef khronos_uintptr_t EGLNativeWindowType; - #else #error "Platform not recognized" #endif -- 2.9.3 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
