Skip to content

Commit

Permalink
Using the latest Khronos Headers for EGL, OpenGL ES 2.0 and OpenGL ES…
Browse files Browse the repository at this point in the history
… 3.0
  • Loading branch information
javedrabbani committed Nov 19, 2013
1 parent 99f8bdd commit 5de5acf
Show file tree
Hide file tree
Showing 8 changed files with 2,957 additions and 2,539 deletions.
911 changes: 500 additions & 411 deletions External/Include/EGL/eglext.h

Large diffs are not rendered by default.

14 changes: 12 additions & 2 deletions External/Include/EGL/eglplatform.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define __eglplatform_h_

/*
** Copyright (c) 2007-2009 The Khronos Group Inc.
** Copyright (c) 2007-2013 The Khronos Group Inc.
**
** Permission is hereby granted, free of charge, to any person obtaining a
** copy of this software and/or associated documentation files (the
Expand All @@ -25,7 +25,7 @@
*/

/* Platform-specific types and definitions for egl.h
* $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
* $Revision: 23432 $ on $Date: 2013-10-09 00:57:24 -0700 (Wed, 09 Oct 2013) $
*
* Adopters may modify khrplatform.h and this file to suit their platform.
* You are encouraged to submit all modifications to the Khronos group so that
Expand Down Expand Up @@ -83,6 +83,16 @@ typedef int EGLNativeDisplayType;
typedef void *EGLNativeWindowType;
typedef void *EGLNativePixmapType;

#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(__unix__)

/* X11 (tentative) */
Expand Down
Loading

0 comments on commit 5de5acf

Please sign in to comment.