diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2016-06-20 10:02:30 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2016-06-20 10:02:30 +0100 |
| commit | 9c34aeb5643b68789ba0e2d5ded62d934dcbf464 (patch) | |
| tree | ff4f8dad7c559509ef91633b8c3c9d600ede6bba /thirdparty | |
| parent | b29a5807eb07a205802ead219c3e5030e7fb4fd6 (diff) | |
khronos: Remove unnecessary Android patch.
Android support has been included upstream.
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/khronos/EGL/eglplatform.h | 10 | ||||
| -rw-r--r-- | thirdparty/khronos/EGL/eglplatform.patch | 12 |
2 files changed, 1 insertions, 21 deletions
diff --git a/thirdparty/khronos/EGL/eglplatform.h b/thirdparty/khronos/EGL/eglplatform.h index 203f08c5..35364ce4 100644 --- a/thirdparty/khronos/EGL/eglplatform.h +++ b/thirdparty/khronos/EGL/eglplatform.h @@ -93,16 +93,6 @@ typedef struct ANativeWindow* EGLNativeWindowType; typedef struct egl_native_pixmap_t* EGLNativePixmapType; typedef void* EGLNativeDisplayType; -#elif defined(__ANDROID__) || defined(ANDROID) - -#include <android/native_window.h> - -struct egl_native_pixmap_t; - -typedef struct ANativeWindow* EGLNativeWindowType; -typedef struct egl_native_pixmap_t* EGLNativePixmapType; -typedef void* EGLNativeDisplayType; - #elif defined(__APPLE__) || defined(__QNXNTO__) typedef void *EGLNativeDisplayType; diff --git a/thirdparty/khronos/EGL/eglplatform.patch b/thirdparty/khronos/EGL/eglplatform.patch index 0882ecac..a113b73e 100644 --- a/thirdparty/khronos/EGL/eglplatform.patch +++ b/thirdparty/khronos/EGL/eglplatform.patch @@ -1,19 +1,9 @@ --- eglplatform.h.orig 2015-04-30 22:05:42.000000000 +0100 +++ eglplatform.h 2015-06-25 16:35:12.366373499 +0100 -@@ -93,6 +93,22 @@ +@@ -93,6 +93,12 @@ typedef struct egl_native_pixmap_t* EGLNativePixmapType; typedef void* EGLNativeDisplayType; -+#elif defined(__ANDROID__) || defined(ANDROID) -+ -+#include <android/native_window.h> -+ -+struct egl_native_pixmap_t; -+ -+typedef struct ANativeWindow* EGLNativeWindowType; -+typedef struct egl_native_pixmap_t* EGLNativePixmapType; -+typedef void* EGLNativeDisplayType; -+ +#elif defined(__APPLE__) || defined(__QNXNTO__) + +typedef void *EGLNativeDisplayType; |