Skip to content

A
angle
Commit afaa0490 by michaelbai@google.com
Options

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
parent 32b11443
Showing with 9 additions and 1 deletion
include/EGL/eglplatform.h
...@@ -89,7 +89,7 @@ typedef struct wl_display *EGLNativeDisplayType; ...@@ -89,7 +89,7 @@ typedef struct wl_display *EGLNativeDisplayType;
typedef struct wl_egl_pixmap *EGLNativePixmapType; typedef struct wl_egl_pixmap *EGLNativePixmapType;
typedef struct wl_egl_window *EGLNativeWindowType; typedef struct wl_egl_window *EGLNativeWindowType;
#elif defined(__unix__) #elif defined(__unix__) && !defined(ANDROID)
/* X11 (tentative) */ /* X11 (tentative) */
#include <X11/Xlib.h> #include <X11/Xlib.h>
...@@ -99,6 +99,14 @@ typedef Display *EGLNativeDisplayType; ...@@ -99,6 +99,14 @@ typedef Display *EGLNativeDisplayType;
typedef Pixmap EGLNativePixmapType; typedef Pixmap EGLNativePixmapType;
typedef Window EGLNativeWindowType; 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 #else
#error "Platform not recognized" #error "Platform not recognized"
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment