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

Commit edf87c18 authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

Update EGL headers to version 1.5 

Pull latest egl.h, eglext.h and eglplatform.h from EGL registry
(https://github.com/KhronosGroup/EGL-Registry)
api/EGL/egl.h, api/EGL/eglext.h and api/EGL/eglplatform.h
to opengl/include/EGL

Test: compile
Bug: 80239516
Change-Id: I8522d619f34453c1a3ce28c013d911fbaabdd7d3
(cherry picked from commit df66bdcb564057ba0afa80c902af458dae83b311)
parent c284ebf1

opengl/include/EGL/egl.h

+61 −5
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ extern "C" { 
** used to make the header, and the header can be found at

**   http://www.khronos.org/registry/egl

**

** Khronos $Git commit SHA1: a732b061e7 $ on $Git commit date: 2017-06-17 23:27:53 +0100 $

** Khronos $Git commit SHA1: bae3518c48 $ on $Git commit date: 2018-05-17 10:56:57 -0700 $

*/



#include <EGL/eglplatform.h>



/* Generated on date 20170627 */

/* Generated on date 20180517 */



/* Generated C header for:

 * API: egl
@@ -235,10 +235,66 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void); 
EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void);

#endif /* EGL_VERSION_1_4 */



/* This version of Android does not yet support EGL 1.5, but the following

 * portion of EGL 1.5 is included in order to support portions of "eglext.h".

 */

#ifndef EGL_VERSION_1_5

#define EGL_VERSION_1_5 1

typedef void *EGLSync;

typedef intptr_t EGLAttrib;

typedef khronos_utime_nanoseconds_t EGLTime;

typedef void *EGLImage;

#define EGL_CONTEXT_MAJOR_VERSION         0x3098

#define EGL_CONTEXT_MINOR_VERSION         0x30FB

#define EGL_CONTEXT_OPENGL_PROFILE_MASK   0x30FD

#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY 0x31BD

#define EGL_NO_RESET_NOTIFICATION         0x31BE

#define EGL_LOSE_CONTEXT_ON_RESET         0x31BF

#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT 0x00000001

#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT 0x00000002

#define EGL_CONTEXT_OPENGL_DEBUG          0x31B0

#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE 0x31B1

#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS  0x31B2

#define EGL_OPENGL_ES3_BIT                0x00000040

#define EGL_CL_EVENT_HANDLE               0x309C

#define EGL_SYNC_CL_EVENT                 0x30FE

#define EGL_SYNC_CL_EVENT_COMPLETE        0x30FF

#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE  0x30F0

#define EGL_SYNC_TYPE                     0x30F7

#define EGL_SYNC_STATUS                   0x30F1

#define EGL_SYNC_CONDITION                0x30F8

#define EGL_SIGNALED                      0x30F2

#define EGL_UNSIGNALED                    0x30F3

#define EGL_SYNC_FLUSH_COMMANDS_BIT       0x0001

#define EGL_FOREVER                       0xFFFFFFFFFFFFFFFFull

#define EGL_TIMEOUT_EXPIRED               0x30F5

#define EGL_CONDITION_SATISFIED           0x30F6

#define EGL_NO_SYNC                       EGL_CAST(EGLSync,0)

#define EGL_SYNC_FENCE                    0x30F9

#define EGL_GL_COLORSPACE                 0x309D

#define EGL_GL_COLORSPACE_SRGB            0x3089

#define EGL_GL_COLORSPACE_LINEAR          0x308A

#define EGL_GL_RENDERBUFFER               0x30B9

#define EGL_GL_TEXTURE_2D                 0x30B1

#define EGL_GL_TEXTURE_LEVEL              0x30BC

#define EGL_GL_TEXTURE_3D                 0x30B2

#define EGL_GL_TEXTURE_ZOFFSET            0x30BD

#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x30B3

#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x30B4

#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x30B5

#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x30B6

#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x30B7

#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8

#define EGL_IMAGE_PRESERVED               0x30D2

#define EGL_NO_IMAGE                      EGL_CAST(EGLImage,0)

EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync);

EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);

EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttrib (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value);

EGLAPI EGLImage EGLAPIENTRY eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImage (EGLDisplay dpy, EGLImage image);

EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplay (EGLenum platform, void *native_display, const EGLAttrib *attrib_list);

EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);

EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags);

#endif /* EGL_VERSION_1_5 */



#ifdef __cplusplus

}

opengl/include/EGL/eglext.h

+28 −2
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ extern "C" { 
** used to make the header, and the header can be found at

**   http://www.khronos.org/registry/egl

**

** Khronos $Git commit SHA1: feaaeb19e1 $ on $Git commit date: 2018-02-26 20:49:02 -0800 $

** Khronos $Git commit SHA1: bae3518c48 $ on $Git commit date: 2018-05-17 10:56:57 -0700 $

*/



#include <EGL/eglplatform.h>



#define EGL_EGLEXT_VERSION 20180228

#define EGL_EGLEXT_VERSION 20180517



/* Generated C header for:

 * API: egl
@@ -618,6 +618,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSu 
#define EGL_EXT_client_extensions 1

#endif /* EGL_EXT_client_extensions */



#ifndef EGL_EXT_client_sync

#define EGL_EXT_client_sync 1

#define EGL_SYNC_CLIENT_EXT               0x3364

#define EGL_SYNC_CLIENT_SIGNAL_EXT        0x3365

typedef EGLBoolean (EGLAPIENTRYP PFNEGLCLIENTSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglClientSignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);

#endif

#endif /* EGL_EXT_client_sync */



#ifndef EGL_EXT_compositor

#define EGL_EXT_compositor 1

#define EGL_PRIMARY_COMPOSITOR_CONTEXT_EXT 0x3460
@@ -903,6 +913,14 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSu 
#endif

#endif /* EGL_EXT_swap_buffers_with_damage */



#ifndef EGL_EXT_sync_reuse

#define EGL_EXT_sync_reuse 1

typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNSIGNALSYNCEXTPROC) (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglUnsignalSyncEXT (EGLDisplay dpy, EGLSync sync, const EGLAttrib *attrib_list);

#endif

#endif /* EGL_EXT_sync_reuse */



#ifndef EGL_EXT_yuv_surface

#define EGL_EXT_yuv_surface 1

#define EGL_YUV_ORDER_EXT                 0x3301
@@ -1147,6 +1165,14 @@ EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalAttribsNV (EGLDi 
#define EGL_STREAM_FIFO_SYNCHRONOUS_NV    0x3336

#endif /* EGL_NV_stream_fifo_synchronous */



#ifndef EGL_NV_stream_flush

#define EGL_NV_stream_flush 1

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMFLUSHNVPROC) (EGLDisplay dpy, EGLStreamKHR stream);

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglStreamFlushNV (EGLDisplay dpy, EGLStreamKHR stream);

#endif

#endif /* EGL_NV_stream_flush */



#ifndef EGL_NV_stream_frame_limits

#define EGL_NV_stream_frame_limits 1

#define EGL_PRODUCER_MAX_FRAME_HINT_NV    0x3337

opengl/include/EGL/eglplatform.h

+34 −2
Original line number Diff line number Diff line
@@ -77,12 +77,24 @@ typedef HDC EGLNativeDisplayType; 
typedef HBITMAP EGLNativePixmapType;

typedef HWND    EGLNativeWindowType;



#elif defined(__APPLE__) || defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */

#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */



typedef int   EGLNativeDisplayType;

typedef void *EGLNativeWindowType;

typedef void *EGLNativePixmapType;



#elif defined(WL_EGL_PLATFORM)



typedef struct wl_display     *EGLNativeDisplayType;

typedef struct wl_egl_pixmap  *EGLNativePixmapType;

typedef struct wl_egl_window  *EGLNativeWindowType;



#elif defined(__GBM__)



typedef struct gbm_device  *EGLNativeDisplayType;

typedef struct gbm_bo      *EGLNativePixmapType;

typedef void               *EGLNativeWindowType;



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



struct ANativeWindow;
@@ -92,7 +104,13 @@ typedef struct ANativeWindow* EGLNativeWindowType; 
typedef struct egl_native_pixmap_t*     EGLNativePixmapType;

typedef void*                           EGLNativeDisplayType;



#elif defined(__unix__)

#elif defined(USE_OZONE)



typedef intptr_t EGLNativeDisplayType;

typedef intptr_t EGLNativeWindowType;

typedef intptr_t EGLNativePixmapType;



#elif defined(__unix__) || defined(USE_X11)



/* X11 (tentative)  */

#include <X11/Xlib.h>
@@ -102,6 +120,20 @@ typedef Display *EGLNativeDisplayType; 
typedef Pixmap   EGLNativePixmapType;

typedef Window   EGLNativeWindowType;



#elif defined(__APPLE__)



typedef int   EGLNativeDisplayType;

typedef void *EGLNativeWindowType;

typedef void *EGLNativePixmapType;



#elif defined(__HAIKU__)



#include <kernel/image.h>



typedef void              *EGLNativeDisplayType;

typedef khronos_uintptr_t  EGLNativePixmapType;

typedef khronos_uintptr_t  EGLNativeWindowType;



#else

#error "Platform not recognized"

#endif