Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2346d022 authored by David 'Digit' Turner's avatar David 'Digit' Turner Committed by Android Git Automerger
Browse files

am b7a109c0: Merge "Refresh EGL header to work with the NDK" into gingerbread 

* commit 'b7a109c02735bb0d9e0bcb8f84e4aa3923701460':
  Refresh EGL header to work with the NDK
parents fcc532c1 3aa9fe05

opengl/include/EGL/eglplatform.h

+11 −12
Original line number Original line Diff line number Diff line
@@ -78,18 +78,7 @@ typedef int EGLNativeDisplayType; 
typedef void *EGLNativeWindowType;

typedef void *EGLNativeWindowType;

typedef void *EGLNativePixmapType;

typedef void *EGLNativePixmapType;





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

#elif defined(__ANDROID__) || defined(ANDROID)



/* X11 (tentative)  */

#include <X11/Xlib.h>

#include <X11/Xutil.h>



typedef Display *EGLNativeDisplayType;

typedef Pixmap   EGLNativePixmapType;

typedef Window   EGLNativeWindowType;





#elif defined(ANDROID)





#include <android/native_window.h>

#include <android/native_window.h>
@@ -99,6 +88,16 @@ typedef struct ANativeWindow* EGLNativeWindowType; 
typedef struct egl_native_pixmap_t*     EGLNativePixmapType;

typedef struct egl_native_pixmap_t*     EGLNativePixmapType;

typedef void*                           EGLNativeDisplayType;

typedef void*                           EGLNativeDisplayType;





#elif defined(__unix__)



/* X11 (tentative)  */

#include <X11/Xlib.h>

#include <X11/Xutil.h>



typedef Display *EGLNativeDisplayType;

typedef Pixmap   EGLNativePixmapType;

typedef Window   EGLNativeWindowType;



#else

#else

#error "Platform not recognized"

#error "Platform not recognized"

#endif

#endif