Upstream android's change for angle

BUG= TEST= Review URL: http://codereview.appspot.com/5410050 git-svn-id: https://angleproject.googlecode.com/svn/trunk@887 736b8ea6-26fd-11df-bfd4-992fa37f6226

Upstream android's change for angle
afaa0490 · michaelbai@google.com · 32b11443 · afaa0490
Commit afaa0490 authored Nov 21, 2011 by michaelbai@google.com
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

eglplatform.h include/EGL/eglplatform.h +9 -1

No files found.
--- a/include/EGL/eglplatform.h
+++ b/include/EGL/eglplatform.h
@@ -89,7 +89,7 @@ typedef struct wl_display     *EGLNativeDisplayType;
 typedef struct wl_egl_pixmap  *EGLNativePixmapType;
 typedef struct wl_egl_window  *EGLNativeWindowType;

-#elif defined(__unix__)
+#elif defined(__unix__) && !defined(ANDROID)

 /* X11 (tentative)  */
 #include <X11/Xlib.h>
@@ -99,6 +99,14 @@ typedef Display *EGLNativeDisplayType;
 typedef Pixmap   EGLNativePixmapType;
 typedef Window   EGLNativeWindowType;

+#elif defined(ANDROID)
+
+struct egl_native_pixmap_t;
+
+typedef struct ANativeWindow*           EGLNativeWindowType;
+typedef struct egl_native_pixmap_t*     EGLNativePixmapType;
+typedef void*                           EGLNativeDisplayType;
+
 #else
 #error "Platform not recognized"
 #endif