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

Commit bf667e31 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev 

* changes:
  replace eglWaitSyncANDROID by eglWaitSyncKHR
  update EGL headers to most recent
  cleanup EGL extensions strings and entry-points
parents 94ebadf4 2bb71687

libs/gui/GLConsumer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ const bool GLConsumer::sUseNativeFenceSync = true; 
const bool GLConsumer::sUseNativeFenceSync = false;

#endif



// This compile option makes GLConsumer use the EGL_ANDROID_sync_wait

// This compile option makes GLConsumer use the EGL_KHR_wait_sync

// extension to insert server-side waits into the GLES command stream.  This

// feature requires the EGL_ANDROID_native_fence_sync and

// EGL_ANDROID_wait_sync extensions.

// EGL_KHR_wait_sync extensions.

#ifdef USE_WAIT_SYNC

static const bool useWaitSync = true;

#else
@@ -848,7 +848,7 @@ status_t GLConsumer::doGLFenceWaitLocked() const { 
            // XXX: The spec draft is inconsistent as to whether this should

            // return an EGLint or void.  Ignore the return value for now, as

            // it's not strictly needed.

            eglWaitSyncANDROID(dpy, sync, 0);

            eglWaitSyncKHR(dpy, sync, 0);

            EGLint eglErr = eglGetError();

            eglDestroySyncKHR(dpy, sync);

            if (eglErr != EGL_SUCCESS) {

opengl/include/EGL/eglext.h

+319 −74
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ extern "C" { 
#endif



/*

** Copyright (c) 2007-2010 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
@@ -34,8 +34,8 @@ extern "C" { 


/* Header file version number */

/* Current version at http://www.khronos.org/registry/egl/ */

/* $Revision: 11249 $ on $Date: 2010-05-05 09:54:28 -0700 (Wed, 05 May 2010) $ */

#define EGL_EGLEXT_VERSION 5

/* $Revision: 20690 $ on $Date: 2013-02-22 17:15:05 -0800 (Fri, 22 Feb 2013) $ */

#define EGL_EGLEXT_VERSION 15



#ifndef EGL_KHR_config_attribs

#define EGL_KHR_config_attribs 1
@@ -120,6 +120,7 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGL 
#define EGL_GL_RENDERBUFFER_KHR			0x30B9	/* eglCreateImageKHR target */

#endif



#if KHRONOS_SUPPORT_INT64   /* EGLTimeKHR requires 64-bit uint support */

#ifndef EGL_KHR_reusable_sync

#define EGL_KHR_reusable_sync 1
@@ -149,6 +150,7 @@ typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSy 
typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);

#endif

#endif



#ifndef EGL_KHR_image_base

#define EGL_KHR_image_base 1
@@ -169,6 +171,11 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EG 
#define EGL_CONTEXT_PRIORITY_LOW_IMG		0x3103

#endif



#ifndef EGL_KHR_lock_surface2

#define EGL_KHR_lock_surface2 1

#define EGL_BITMAP_PIXEL_SIZE_KHR		0x3110

#endif



#ifndef EGL_NV_coverage_sample

#define EGL_NV_coverage_sample 1

#define EGL_COVERAGE_BUFFERS_NV			0x30E0
@@ -182,6 +189,7 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EG 
#define EGL_DEPTH_ENCODING_NONLINEAR_NV		0x30E3

#endif



#if KHRONOS_SUPPORT_INT64   /* EGLTimeNV requires 64-bit uint support */

#ifndef EGL_NV_sync

#define EGL_NV_sync 1

#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV	0x30E6
@@ -198,14 +206,14 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EG 
#define EGL_SYNC_FENCE_NV			0x30EF

#define EGL_NO_SYNC_NV				((EGLSyncNV)0)

typedef void* EGLSyncNV;

typedef unsigned long long EGLTimeNV;

typedef khronos_utime_nanoseconds_t EGLTimeNV;

#ifdef EGL_EGLEXT_PROTOTYPES

EGLSyncNV eglCreateFenceSyncNV (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

EGLBoolean eglDestroySyncNV (EGLSyncNV sync);

EGLBoolean eglFenceNV (EGLSyncNV sync);

EGLint eglClientWaitSyncNV (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);

EGLBoolean eglSignalSyncNV (EGLSyncNV sync, EGLenum mode);

EGLBoolean eglGetSyncAttribNV (EGLSyncNV sync, EGLint attribute, EGLint *value);

EGLAPI EGLSyncNV EGLAPIENTRY eglCreateFenceSyncNV (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncNV (EGLSyncNV sync);

EGLAPI EGLBoolean EGLAPIENTRY eglFenceNV (EGLSyncNV sync);

EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncNV (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);

EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncNV (EGLSyncNV sync, EGLenum mode);

EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribNV (EGLSyncNV sync, EGLint attribute, EGLint *value);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync);
@@ -214,7 +222,9 @@ typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV sync, EGLint 
typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV sync, EGLenum mode);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGLint attribute, EGLint *value);

#endif

#endif



#if KHRONOS_SUPPORT_INT64   /* Dependent on EGL_KHR_reusable_sync which requires 64-bit uint support */

#ifndef EGL_KHR_fence_sync

#define EGL_KHR_fence_sync 1

/* Reuses most tokens and entry points from EGL_KHR_reusable_sync */
@@ -222,20 +232,179 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGL 
#define EGL_SYNC_CONDITION_KHR			0x30F8

#define EGL_SYNC_FENCE_KHR			0x30F9

#endif

#endif



#ifndef EGL_ANDROID_image_native_buffer

#define EGL_ANDROID_image_native_buffer 1

struct ANativeWindowBuffer;

#define EGL_NATIVE_BUFFER_ANDROID               0x3140  /* eglCreateImageKHR target */

#ifndef EGL_HI_clientpixmap

#define EGL_HI_clientpixmap 1



/* Surface Attribute */

#define EGL_CLIENT_PIXMAP_POINTER_HI		0x8F74

/*

 * Structure representing a client pixmap

 * (pixmap's data is in client-space memory).

 */

struct EGLClientPixmapHI

{

	void*		pData;

	EGLint		iWidth;

	EGLint		iHeight;

	EGLint		iStride;

};

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI(EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEHIPROC) (EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI* pixmap);

#endif	/* EGL_HI_clientpixmap */



#ifndef EGL_HI_colorformats

#define EGL_HI_colorformats 1

/* Config Attribute */

#define EGL_COLOR_FORMAT_HI			0x8F70

/* Color Formats */

#define EGL_COLOR_RGB_HI			0x8F71

#define EGL_COLOR_RGBA_HI			0x8F72

#define EGL_COLOR_ARGB_HI			0x8F73

#endif /* EGL_HI_colorformats */



#ifndef EGL_MESA_drm_image

#define EGL_MESA_drm_image 1

#define EGL_DRM_BUFFER_FORMAT_MESA		0x31D0	    /* CreateDRMImageMESA attribute */

#define EGL_DRM_BUFFER_USE_MESA			0x31D1	    /* CreateDRMImageMESA attribute */

#define EGL_DRM_BUFFER_FORMAT_ARGB32_MESA	0x31D2	    /* EGL_IMAGE_FORMAT_MESA attribute value */

#define EGL_DRM_BUFFER_MESA			0x31D3	    /* eglCreateImageKHR target */

#define EGL_DRM_BUFFER_STRIDE_MESA		0x31D4

#define EGL_DRM_BUFFER_USE_SCANOUT_MESA		0x00000001  /* EGL_DRM_BUFFER_USE_MESA bits */

#define EGL_DRM_BUFFER_USE_SHARE_MESA		0x00000002  /* EGL_DRM_BUFFER_USE_MESA bits */

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLImageKHR EGLAPIENTRY eglCreateDRMImageMESA (EGLDisplay dpy, const EGLint *attrib_list);

EGLAPI EGLBoolean EGLAPIENTRY eglExportDRMImageMESA (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);

#endif



#ifndef EGL_ANDROID_recordable

#define EGL_ANDROID_recordable 1

#define EGL_RECORDABLE_ANDROID                  0x3142  /* EGLConfig attribute */

#ifndef EGL_NV_post_sub_buffer

#define EGL_NV_post_sub_buffer 1

#define EGL_POST_SUB_BUFFER_SUPPORTED_NV	0x30BE

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLBoolean (EGLAPIENTRYP PFNEGLPOSTSUBBUFFERNVPROC) (EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height);

#endif



#ifndef EGL_ANGLE_query_surface_pointer

#define EGL_ANGLE_query_surface_pointer 1

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean eglQuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value);

#endif

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACEPOINTERANGLEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value);

#endif



#ifndef EGL_ANGLE_surface_d3d_texture_2d_share_handle

#define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1

#define EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE	0x3200

#endif



#ifndef EGL_NV_coverage_sample_resolve

#define EGL_NV_coverage_sample_resolve 1

#define EGL_COVERAGE_SAMPLE_RESOLVE_NV		0x3131

#define EGL_COVERAGE_SAMPLE_RESOLVE_DEFAULT_NV	0x3132

#define EGL_COVERAGE_SAMPLE_RESOLVE_NONE_NV	0x3133

#endif



#if KHRONOS_SUPPORT_INT64   /* EGLuint64NV requires 64-bit uint support */

#ifndef EGL_NV_system_time

#define EGL_NV_system_time 1

typedef khronos_utime_nanoseconds_t EGLuint64NV;

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeFrequencyNV(void);

EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV(void);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC) (void);

typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMENVPROC) (void);

#endif

#endif



#if KHRONOS_SUPPORT_INT64 /* EGLuint64KHR requires 64-bit uint support */

#ifndef EGL_KHR_stream

#define EGL_KHR_stream 1

typedef void* EGLStreamKHR;

typedef khronos_uint64_t EGLuint64KHR;

#define EGL_NO_STREAM_KHR			((EGLStreamKHR)0)

#define EGL_CONSUMER_LATENCY_USEC_KHR		0x3210

#define EGL_PRODUCER_FRAME_KHR			0x3212

#define EGL_CONSUMER_FRAME_KHR			0x3213

#define EGL_STREAM_STATE_KHR			0x3214

#define EGL_STREAM_STATE_CREATED_KHR		0x3215

#define EGL_STREAM_STATE_CONNECTING_KHR		0x3216

#define EGL_STREAM_STATE_EMPTY_KHR		0x3217

#define EGL_STREAM_STATE_NEW_FRAME_AVAILABLE_KHR    0x3218

#define EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR    0x3219

#define EGL_STREAM_STATE_DISCONNECTED_KHR	0x321A

#define EGL_BAD_STREAM_KHR			0x321B

#define EGL_BAD_STATE_KHR			0x321C

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamKHR(EGLDisplay dpy, const EGLint *attrib_list);

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

EGLAPI EGLBoolean EGLAPIENTRY eglStreamAttribKHR(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint value);

EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamKHR(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint *value);

EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLuint64KHR *value);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMKHRPROC)(EGLDisplay dpy, const EGLint *attrib_list);

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

typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMATTRIBKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint value);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint *value);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMU64KHRPROC)(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLuint64KHR *value);

#endif

#endif



#ifdef EGL_KHR_stream /* Requires KHR_stream extension */

#ifndef EGL_KHR_stream_consumer_gltexture

#define EGL_KHR_stream_consumer_gltexture 1

#define EGL_CONSUMER_ACQUIRE_TIMEOUT_USEC_KHR	0x321E

#ifdef EGL_EGLEXT_PROTOTYPES

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

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

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

#endif /* EGL_EGLEXT_PROTOTYPES */

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

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

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

#endif

#endif



#ifdef EGL_KHR_stream /* Requires KHR_stream extension */

#ifndef EGL_KHR_stream_producer_eglsurface

#define EGL_KHR_stream_producer_eglsurface 1

#define EGL_STREAM_BIT_KHR			0x0800

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLSurface EGLAPIENTRY eglCreateStreamProducerSurfaceKHR(EGLDisplay dpy, EGLConfig config, EGLStreamKHR stream, const EGLint *attrib_list);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC)(EGLDisplay dpy, EGLConfig config, EGLStreamKHR stream, const EGLint *attrib_list);

#endif

#endif



#ifdef EGL_KHR_stream /* Requires KHR_stream extension */

#ifndef EGL_KHR_stream_producer_aldatalocator

#define EGL_KHR_stream_producer_aldatalocator 1

#endif

#endif



#ifdef EGL_KHR_stream /* Requires KHR_stream extension */

#ifndef EGL_KHR_stream_fifo

#define EGL_KHR_stream_fifo 1

/* reuse EGLTimeKHR */

#define EGL_STREAM_FIFO_LENGTH_KHR		0x31FC

#define EGL_STREAM_TIME_NOW_KHR			0x31FD

#define EGL_STREAM_TIME_CONSUMER_KHR		0x31FE

#define EGL_STREAM_TIME_PRODUCER_KHR		0x31FF

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamTimeKHR(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLTimeKHR *value);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMTIMEKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLTimeKHR *value);

#endif

#endif



/* EGL_EXT_create_context_robustness

 */

#ifndef EGL_EXT_create_context_robustness

#define EGL_EXT_create_context_robustness 1

#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT	0x30BF
@@ -244,22 +413,87 @@ struct ANativeWindowBuffer; 
#define EGL_LOSE_CONTEXT_ON_RESET_EXT		0x31BF

#endif



/* EGL_NV_system_time

 */

#ifndef EGL_NV_system_time

#define EGL_NV_system_time 1

typedef khronos_int64_t EGLint64NV;

typedef khronos_uint64_t EGLuint64NV;

#ifndef EGL_ANGLE_d3d_share_handle_client_buffer

#define EGL_ANGLE_d3d_share_handle_client_buffer 1

/* reuse EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE */

#endif



#ifndef EGL_KHR_create_context

#define EGL_KHR_create_context 1

#define EGL_CONTEXT_MAJOR_VERSION_KHR			    EGL_CONTEXT_CLIENT_VERSION

#define EGL_CONTEXT_MINOR_VERSION_KHR			    0x30FB

#define EGL_CONTEXT_FLAGS_KHR				    0x30FC

#define EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR		    0x30FD

#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR  0x31BD

#define EGL_NO_RESET_NOTIFICATION_KHR			    0x31BE

#define EGL_LOSE_CONTEXT_ON_RESET_KHR			    0x31BF

#define EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR		    0x00000001

#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR	    0x00000002

#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR	    0x00000004

#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR		    0x00000001

#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR    0x00000002

#define EGL_OPENGL_ES3_BIT_KHR				    0x00000040

#endif



#ifndef EGL_KHR_surfaceless_context

#define EGL_KHR_surfaceless_context 1

/* No tokens/entry points, just relaxes an error condition */

#endif



#ifdef EGL_KHR_stream /* Requires KHR_stream extension */

#ifndef EGL_KHR_stream_cross_process_fd

#define EGL_KHR_stream_cross_process_fd 1

typedef int EGLNativeFileDescriptorKHR;

#define EGL_NO_FILE_DESCRIPTOR_KHR		((EGLNativeFileDescriptorKHR)(-1))

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeFrequencyNV(void);

EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV(void);

EGLAPI EGLNativeFileDescriptorKHR EGLAPIENTRY eglGetStreamFileDescriptorKHR(EGLDisplay dpy, EGLStreamKHR stream);

EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamFromFileDescriptorKHR(EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLNativeFileDescriptorKHR (EGLAPIENTRYP PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC)(EGLDisplay dpy, EGLStreamKHR stream);

typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC)(EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor);

#endif

typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC)(void);

typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMENVPROC)(void);

#endif



/* EGL_ANDROID_blob_cache

 */

#ifndef EGL_EXT_multiview_window

#define EGL_EXT_multiview_window 1

#define EGL_MULTIVIEW_VIEW_COUNT_EXT		0x3134

#endif



#ifndef EGL_KHR_wait_sync

#define EGL_KHR_wait_sync 1

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLint (EGLAPIENTRYP PFNEGLWAITSYNCKHRPROC)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);

#endif



#ifndef EGL_NV_post_convert_rounding

#define EGL_NV_post_convert_rounding 1

/* No tokens or entry points, just relaxes behavior of SwapBuffers */

#endif



#ifndef EGL_NV_native_query

#define EGL_NV_native_query 1

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativeDisplayNV( EGLDisplay dpy, EGLNativeDisplayType* display_id);

EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativeWindowNV( EGLDisplay dpy, EGLSurface surf, EGLNativeWindowType* window);

EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativePixmapNV( EGLDisplay dpy, EGLSurface surf, EGLNativePixmapType* pixmap);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYNATIVEDISPLAYNVPROC)(EGLDisplay dpy, EGLNativeDisplayType *display_id);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYNATIVEWINDOWNVPROC)(EGLDisplay dpy, EGLSurface surf, EGLNativeWindowType *window);

typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYNATIVEPIXMAPNVPROC)(EGLDisplay dpy, EGLSurface surf, EGLNativePixmapType *pixmap);

#endif



#ifndef EGL_NV_3dvision_surface

#define EGL_NV_3dvision_surface 1

#define EGL_AUTO_STEREO_NV			0x3136

#endif



#ifndef EGL_ANDROID_framebuffer_target

#define EGL_ANDROID_framebuffer_target 1

#define EGL_FRAMEBUFFER_TARGET_ANDROID		0x3147

#endif



#ifndef EGL_ANDROID_blob_cache

#define EGL_ANDROID_blob_cache 1

typedef khronos_ssize_t EGLsizeiANDROID;
@@ -268,51 +502,62 @@ typedef EGLsizeiANDROID (*EGLGetBlobFuncANDROID) (const void* key, EGLsizeiANDRO 
#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI void EGLAPIENTRY eglSetBlobCacheFuncsANDROID(EGLDisplay dpy, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef void (EGLAPIENTRYP PFNEGLSETBLOBCACHEFUNCSANDROIDPROC) (EGLDisplay dpy,

        EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);

typedef void (EGLAPIENTRYP PFNEGLSETBLOBCACHEFUNCSANDROIDPROC)(EGLDisplay dpy, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);

#endif



/* EGL_IMG_hibernate_process

 */

#ifndef EGL_IMG_hibernate_process

#define EGL_IMG_hibernate_process 1

typedef EGLBoolean (EGLAPIENTRYP PFEGLHIBERNATEPROCESSIMGPROC)(void);

typedef EGLBoolean (EGLAPIENTRYP PFEGLAWAKENPROCESSIMGPROC)(void);

#ifndef EGL_ANDROID_image_native_buffer

#define EGL_ANDROID_image_native_buffer 1

#define EGL_NATIVE_BUFFER_ANDROID		0x3140

#endif



/* EGL_ANDROID_native_fence_sync

 */

#ifndef EGL_ANDROID_native_fence_sync

#define EGL_ANDROID_native_fence_sync 1

#define EGL_SYNC_NATIVE_FENCE_ANDROID		0x3144

#define EGL_SYNC_NATIVE_FENCE_FD_ANDROID	0x3145

#define EGL_NO_NATIVE_FENCE_FD_ANDROID                -1

#define EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID	0x3146

#define EGL_NO_NATIVE_FENCE_FD_ANDROID		-1

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID(EGLDisplay dpy, EGLSyncKHR sync);

#endif

typedef EGLint (EGLAPIENTRYP PFNEGLDUPNATIVEFENCEFDANDROID) (EGLDisplay dpy, EGLSyncKHR sync);

#endif



/* EGL_ANDROID_wait_sync

 */

#ifndef EGL_ANDROID_wait_sync

#define EGL_ANDROID_wait_sync

#ifdef EGL_EGLEXT_PROTOTYPES

EGLAPI EGLint EGLAPIENTRY eglWaitSyncANDROID(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);

#endif

typedef EGLint (EGLAPIENTRYP PFNEGLWAITSYNCANDROID) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);

EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID( EGLDisplay dpy, EGLSyncKHR);

#endif /* EGL_EGLEXT_PROTOTYPES */

typedef EGLint (EGLAPIENTRYP PFNEGLDUPNATIVEFENCEFDANDROIDPROC)(EGLDisplay dpy, EGLSyncKHR);

#endif



/* EGL_ANDROID_framebuffer_target

 */

#ifndef EGL_ANDROID_framebuffer_target

#define EGL_ANDROID_framebuffer_target

#define EGL_FRAMEBUFFER_TARGET_ANDROID                0x3147

#ifndef EGL_ANDROID_recordable

#define EGL_ANDROID_recordable 1

#define EGL_RECORDABLE_ANDROID			0x3142

#endif



#ifndef EGL_EXT_buffer_age

#define EGL_EXT_buffer_age 1

#define EGL_BUFFER_AGE_EXT			0x313D

#endif



#ifndef EGL_EXT_image_dma_buf_import

#define EGL_EXT_image_dma_buf_import 1

#define EGL_LINUX_DMA_BUF_EXT			0x3270

#define EGL_LINUX_DRM_FOURCC_EXT		0x3271

#define EGL_DMA_BUF_PLANE0_FD_EXT		0x3272

#define EGL_DMA_BUF_PLANE0_OFFSET_EXT		0x3273

#define EGL_DMA_BUF_PLANE0_PITCH_EXT		0x3274

#define EGL_DMA_BUF_PLANE1_FD_EXT		0x3275

#define EGL_DMA_BUF_PLANE1_OFFSET_EXT		0x3276

#define EGL_DMA_BUF_PLANE1_PITCH_EXT		0x3277

#define EGL_DMA_BUF_PLANE2_FD_EXT		0x3278

#define EGL_DMA_BUF_PLANE2_OFFSET_EXT		0x3279

#define EGL_DMA_BUF_PLANE2_PITCH_EXT		0x327A

#define EGL_YUV_COLOR_SPACE_HINT_EXT		0x327B

#define EGL_SAMPLE_RANGE_HINT_EXT		0x327C

#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D

#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT 0x327E

#define EGL_ITU_REC601_EXT			0x327F

#define EGL_ITU_REC709_EXT			0x3280

#define EGL_ITU_REC2020_EXT			0x3281

#define EGL_YUV_FULL_RANGE_EXT			0x3282

#define EGL_YUV_NARROW_RANGE_EXT		0x3283

#define EGL_YUV_CHROMA_SITING_0_EXT		0x3284

#define EGL_YUV_CHROMA_SITING_0_5_EXT		0x3285

#endif



/* EGL_ANDROID_presentation_time

 */

#ifndef EGL_ANDROID_presentation_time

#define EGL_ANDROID_presentation_time 1

typedef khronos_stime_nanoseconds_t EGLnsecsANDROID;
@@ -327,4 +572,4 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLPRESENTATIONTIMEANDROID) (EGLDisplay dpy, 
}

#endif



#endif
 
#endif /* __eglext_h_ */

opengl/include/EGL/eglplatform.h

+6 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
*/



/* Platform-specific types and definitions for egl.h

 * $Revision: 9724 $ on $Date: 2009-12-02 02:05:33 -0800 (Wed, 02 Dec 2009) $

 * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $

 *

 * 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
@@ -60,6 +60,11 @@ 
 * Windows Device Context. They must be defined in platform-specific

 * code below. The EGL-prefixed versions of Native*Type are the same

 * types, renamed in EGL 1.3 so all types in the API start with "EGL".

 *

 * Khronos STRONGLY RECOMMENDS that you use the default definitions

 * provided below, since these changes affect both binary and source

 * portability of applications using EGL running on different EGL

 * implementations.

 */



#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */

opengl/include/KHR/khrplatform.h

+46 −18
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ 
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.

*/



/* Platform-specific types and definitions.

 * $Revision: 7244 $ on $Date: 2009-01-20 17:06:59 -0800 (Tue, 20 Jan 2009) $

/* Khronos platform-specific types and definitions.

 *

 * $Revision: 9356 $ on $Date: 2009-10-21 02:52:25 -0700 (Wed, 21 Oct 2009) $

 *

 * Adopters may modify this file to suit their platform. Adopters are

 * encouraged to submit platform specific modifications to the Khronos
@@ -40,16 +41,16 @@ 
 *

 *

 * See the Implementer's Guidelines for information about where this file

 * should be located on your system.

 * should be located on your system and for more details of its use:

 *    http://www.khronos.org/registry/implementers_guide.pdf

 *

 * 

 * This file should be included as

 *        #include <KHR/khrplatform.h>

 * by the Khronos API header file that uses its types and defines.

 * by Khronos client API header files that use its types and defines.

 *

 * The types in this file should only be used to define API-specific types.

 * Types defined in this file:

 * The types in khrplatform.h should only be used to define API-specific types.

 *

 * Types defined in khrplatform.h:

 *    khronos_int8_t              signed   8  bit

 *    khronos_uint8_t             unsigned 8  bit

 *    khronos_int16_t             signed   16 bit
@@ -67,16 +68,25 @@ 
 *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in

 *                                         nanoseconds

 *    khronos_stime_nanoseconds_t signed time interval in nanoseconds

 *    khronos_boolean_enum_t      enumerated boolean type. This should

 *      only be used as a base type when a client API's boolean type is

 *      an enum. Client APIs which use an integer or other type for

 *      booleans cannot use this as the base type for their boolean.

 *

 * Tokens defined in khrplatform.h:

 *

 *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.

 *

 *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.

 *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.

 *

 *

 * Macros defined in this file:

 * Calling convention macros defined in this file:

 *    KHRONOS_APICALL

 *    KHRONOS_APIENTRY

 *    KHRONOS_APIATTRIBUTES

 *

 * These may be used in function prototypes as:

 *

 *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(

 *                                  int arg1,

 *                                  int arg2) KHRONOS_APIATTRIBUTES;
@@ -239,5 +249,23 @@ typedef khronos_uint64_t khronos_utime_nanoseconds_t; 
typedef khronos_int64_t        khronos_stime_nanoseconds_t;

#endif



/*

 * Dummy value used to pad enum types to 32 bits.

 */

#ifndef KHRONOS_MAX_ENUM

#define KHRONOS_MAX_ENUM 0x7FFFFFFF

#endif



/*

 * Enumerated boolean type

 *

 * Values other than zero should be considered to be true.  Therefore

 * comparisons should not be made against KHRONOS_TRUE.

 */

typedef enum {

    KHRONOS_FALSE = 0,

    KHRONOS_TRUE  = 1,

    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM

} khronos_boolean_enum_t;



#endif /* __khrplatform_h_ */