Merge "Update the Khronos EGL header files." into main (0e692ca2) · Commits · e / os / android_frameworks_native

opengl/include/EGL/egl.h

+64 −25

Original line number	Original line	Diff line number	Diff line
	@@ -6,39 +6,24 @@ extern "C" {
	#endif		#endif

	/*		/*
	** Copyright (c) 2013-2017 The Khronos Group Inc.		** Copyright 2013-2020 The Khronos Group Inc.
			** SPDX-License-Identifier: Apache-2.0
	**		**
	** Permission is hereby granted, free of charge, to any person obtaining a		** This header is generated from the Khronos EGL XML API Registry.
	** copy of this software and/or associated documentation files (the		** The current version of the Registry, generator scripts
	** "Materials"), to deal in the Materials without restriction, including
	** without limitation the rights to use, copy, modify, merge, publish,
	** distribute, sublicense, and/or sell copies of the Materials, and to
	** permit persons to whom the Materials are furnished to do so, subject to
	** the following conditions:
	**
	** The above copyright notice and this permission notice shall be included
	** in all copies or substantial portions of the Materials.
	**
	** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
	** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
	** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
	** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
	*/
	/*
	** This header is generated from the Khronos OpenGL / OpenGL ES XML
	** API Registry. The current version of the Registry, generator scripts
	** used to make the header, and the header can be found at		** used to make the header, and the header can be found at
	** http://www.khronos.org/registry/egl		** http://www.khronos.org/registry/egl
	**		**
	** Khronos $Git commit SHA1: bae3518c48 $ on $Git commit date: 2018-05-17 10:56:57 -0700 $		** Khronos $Git commit SHA1: 800219cd6e $ on $Git commit date: 2024-05-13 00:13:13 -0700 $
	*/		*/

	#include <EGL/eglplatform.h>		#include <EGL/eglplatform.h>

	/* Generated on date 20180517 */		#ifndef EGL_EGL_PROTOTYPES
			#define EGL_EGL_PROTOTYPES 1
			#endif

			/* Generated on date 20240715 */

	/* Generated C header for:		/* Generated C header for:
	* API: egl		* API: egl
	@@ -118,6 +103,31 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void);
	#define EGL_VERSION 0x3054		#define EGL_VERSION 0x3054
	#define EGL_WIDTH 0x3057		#define EGL_WIDTH 0x3057
	#define EGL_WINDOW_BIT 0x0004		#define EGL_WINDOW_BIT 0x0004
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLCHOOSECONFIGPROC) (EGLDisplay dpy, const EGLint attrib_list, EGLConfig configs, EGLint config_size, EGLint *num_config);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLCOPYBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
			typedef EGLContext (EGLAPIENTRYP PFNEGLCREATECONTEXTPROC) (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
			typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERSURFACEPROC) (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
			typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list);
			typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGATTRIBPROC) (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETCONFIGSPROC) (EGLDisplay dpy, EGLConfig configs, EGLint config_size, EGLint num_config);
			typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETCURRENTDISPLAYPROC) (void);
			typedef EGLSurface (EGLAPIENTRYP PFNEGLGETCURRENTSURFACEPROC) (EGLint readdraw);
			typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETDISPLAYPROC) (EGLNativeDisplayType display_id);
			typedef EGLint (EGLAPIENTRYP PFNEGLGETERRORPROC) (void);
			typedef __eglMustCastToProperFunctionPointerType (EGLAPIENTRYP PFNEGLGETPROCADDRESSPROC) (const char *procname);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLINITIALIZEPROC) (EGLDisplay dpy, EGLint major, EGLint minor);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLMAKECURRENTPROC) (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYCONTEXTPROC) (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);
			typedef const char *(EGLAPIENTRYP PFNEGLQUERYSTRINGPROC) (EGLDisplay dpy, EGLint name);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSPROC) (EGLDisplay dpy, EGLSurface surface);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLTERMINATEPROC) (EGLDisplay dpy);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITGLPROC) (void);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITNATIVEPROC) (EGLint engine);
			#if EGL_EGL_PROTOTYPES
	EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint attrib_list, EGLConfig configs, EGLint config_size, EGLint *num_config);		EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint attrib_list, EGLConfig configs, EGLint config_size, EGLint *num_config);
	EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);		EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
	EGLAPI EGLContext EGLAPIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);		EGLAPI EGLContext EGLAPIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
	@@ -142,6 +152,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers (EGLDisplay dpy, EGLSurface surface
	EGLAPI EGLBoolean EGLAPIENTRY eglTerminate (EGLDisplay dpy);		EGLAPI EGLBoolean EGLAPIENTRY eglTerminate (EGLDisplay dpy);
	EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL (void);		EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL (void);
	EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine);		EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine);
			#endif
	#endif /* EGL_VERSION_1_0 */		#endif /* EGL_VERSION_1_0 */

	#ifndef EGL_VERSION_1_1		#ifndef EGL_VERSION_1_1
	@@ -160,10 +171,16 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine);
	#define EGL_TEXTURE_RGB 0x305D		#define EGL_TEXTURE_RGB 0x305D
	#define EGL_TEXTURE_RGBA 0x305E		#define EGL_TEXTURE_RGBA 0x305E
	#define EGL_TEXTURE_TARGET 0x3081		#define EGL_TEXTURE_TARGET 0x3081
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDTEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETEXIMAGEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLSURFACEATTRIBPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPINTERVALPROC) (EGLDisplay dpy, EGLint interval);
			#if EGL_EGL_PROTOTYPES
	EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);		EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
	EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);		EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
	EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);		EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
	EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval (EGLDisplay dpy, EGLint interval);		EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval (EGLDisplay dpy, EGLint interval);
			#endif
	#endif /* EGL_VERSION_1_1 */		#endif /* EGL_VERSION_1_1 */

	#ifndef EGL_VERSION_1_2		#ifndef EGL_VERSION_1_2
	@@ -199,11 +216,18 @@ typedef void *EGLClientBuffer;
	#define EGL_SWAP_BEHAVIOR 0x3093		#define EGL_SWAP_BEHAVIOR 0x3093
	#define EGL_UNKNOWN EGL_CAST(EGLint,-1)		#define EGL_UNKNOWN EGL_CAST(EGLint,-1)
	#define EGL_VERTICAL_RESOLUTION 0x3091		#define EGL_VERTICAL_RESOLUTION 0x3091
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLBINDAPIPROC) (EGLenum api);
			typedef EGLenum (EGLAPIENTRYP PFNEGLQUERYAPIPROC) (void);
			typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPBUFFERFROMCLIENTBUFFERPROC) (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLRELEASETHREADPROC) (void);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITCLIENTPROC) (void);
			#if EGL_EGL_PROTOTYPES
	EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI (EGLenum api);		EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI (EGLenum api);
	EGLAPI EGLenum EGLAPIENTRY eglQueryAPI (void);		EGLAPI EGLenum EGLAPIENTRY eglQueryAPI (void);
	EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);		EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);
	EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread (void);		EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread (void);
	EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void);		EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void);
			#endif
	#endif /* EGL_VERSION_1_2 */		#endif /* EGL_VERSION_1_2 */

	#ifndef EGL_VERSION_1_3		#ifndef EGL_VERSION_1_3
	@@ -232,7 +256,10 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void);
	#define EGL_OPENGL_API 0x30A2		#define EGL_OPENGL_API 0x30A2
	#define EGL_OPENGL_BIT 0x0008		#define EGL_OPENGL_BIT 0x0008
	#define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400		#define EGL_SWAP_BEHAVIOR_PRESERVED_BIT 0x0400
			typedef EGLContext (EGLAPIENTRYP PFNEGLGETCURRENTCONTEXTPROC) (void);
			#if EGL_EGL_PROTOTYPES
	EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void);		EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void);
			#endif
	#endif /* EGL_VERSION_1_4 */		#endif /* EGL_VERSION_1_4 */

	#ifndef EGL_VERSION_1_5		#ifndef EGL_VERSION_1_5
	@@ -284,6 +311,17 @@ typedef void *EGLImage;
	#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8		#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8
	#define EGL_IMAGE_PRESERVED 0x30D2		#define EGL_IMAGE_PRESERVED 0x30D2
	#define EGL_NO_IMAGE EGL_CAST(EGLImage,0)		#define EGL_NO_IMAGE EGL_CAST(EGLImage,0)
			typedef EGLSync (EGLAPIENTRYP PFNEGLCREATESYNCPROC) (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCPROC) (EGLDisplay dpy, EGLSync sync);
			typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBPROC) (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value);
			typedef EGLImage (EGLAPIENTRYP PFNEGLCREATEIMAGEPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEPROC) (EGLDisplay dpy, EGLImage image);
			typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYPROC) (EGLenum platform, void native_display, const EGLAttrib attrib_list);
			typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void native_window, const EGLAttrib attrib_list);
			typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEPROC) (EGLDisplay dpy, EGLConfig config, void native_pixmap, const EGLAttrib attrib_list);
			typedef EGLBoolean (EGLAPIENTRYP PFNEGLWAITSYNCPROC) (EGLDisplay dpy, EGLSync sync, EGLint flags);
			#if EGL_EGL_PROTOTYPES
	EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);		EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);
	EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync);		EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync);
	EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);		EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);
	@@ -294,6 +332,7 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplay (EGLenum platform, void *nat
	EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface (EGLDisplay dpy, EGLConfig config, void native_window, 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 EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface (EGLDisplay dpy, EGLConfig config, void native_pixmap, const EGLAttrib attrib_list);
	EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags);		EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags);
			#endif
	#endif /* EGL_VERSION_1_5 */		#endif /* EGL_VERSION_1_5 */

	#ifdef __cplusplus		#ifdef __cplusplus

opengl/include/EGL/eglext.h

+210 −27

File changed.

Preview size limit exceeded, changes collapsed.

opengl/include/EGL/eglplatform.h

+41 −30

Original line number	Original line	Diff line number	Diff line
	@@ -2,36 +2,17 @@
	#define __eglplatform_h_		#define __eglplatform_h_

	/*		/*
	** Copyright (c) 2007-2016 The Khronos Group Inc.		** Copyright 2007-2020 The Khronos Group Inc.
	**		** SPDX-License-Identifier: Apache-2.0
	** Permission is hereby granted, free of charge, to any person obtaining a
	** copy of this software and/or associated documentation files (the
	** "Materials"), to deal in the Materials without restriction, including
	** without limitation the rights to use, copy, modify, merge, publish,
	** distribute, sublicense, and/or sell copies of the Materials, and to
	** permit persons to whom the Materials are furnished to do so, subject to
	** the following conditions:
	**
	** The above copyright notice and this permission notice shall be included
	** in all copies or substantial portions of the Materials.
	**
	** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
	** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
	** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
	** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
	** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
	*/		*/

	/* Platform-specific types and definitions for egl.h		/* Platform-specific types and definitions for egl.h
	* $Revision: 30994 $ on $Date: 2015-04-30 13:36:48 -0700 (Thu, 30 Apr 2015) $
	*		*
	* Adopters may modify khrplatform.h and this file to suit their platform.		* 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		* You are encouraged to submit all modifications to the Khronos group so that
	* they can be included in future versions of this file. Please submit changes		* they can be included in future versions of this file. Please submit changes
	* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)		* by filing an issue or pull request on the public Khronos EGL Registry, at
	* by filing a bug against product "EGL" component "Registry".		* https://www.github.com/KhronosGroup/EGL-Registry/
	*/		*/

	#include <KHR/khrplatform.h>		#include <KHR/khrplatform.h>
	@@ -67,7 +48,13 @@
	* implementations.		* implementations.
	*/		*/

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

			typedef void *EGLNativeDisplayType;
			typedef void *EGLNativePixmapType;
			typedef void *EGLNativeWindowType;

			#elif defined(_WIN32) \|\| defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
	#ifndef WIN32_LEAN_AND_MEAN		#ifndef WIN32_LEAN_AND_MEAN
	#define WIN32_LEAN_AND_MEAN 1		#define WIN32_LEAN_AND_MEAN 1
	#endif		#endif
	@@ -77,11 +64,23 @@ typedef HDC EGLNativeDisplayType;
	typedef HBITMAP EGLNativePixmapType;		typedef HBITMAP EGLNativePixmapType;
	typedef HWND EGLNativeWindowType;		typedef HWND EGLNativeWindowType;

			#elif defined(__QNX__)

			typedef khronos_uintptr_t EGLNativeDisplayType;
			typedef struct _screen_pixmap* EGLNativePixmapType; /* screen_pixmap_t */
			typedef struct _screen_window* EGLNativeWindowType; /* screen_window_t */

			#elif defined(__EMSCRIPTEN__)

			typedef int EGLNativeDisplayType;
			typedef int EGLNativePixmapType;
			typedef int EGLNativeWindowType;

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

	typedef int EGLNativeDisplayType;		typedef int EGLNativeDisplayType;
	typedef void *EGLNativeWindowType;
	typedef void *EGLNativePixmapType;		typedef void *EGLNativePixmapType;
			typedef void *EGLNativeWindowType;

	#elif defined(WL_EGL_PLATFORM)		#elif defined(WL_EGL_PLATFORM)

	@@ -100,17 +99,17 @@ typedef void *EGLNativeWindowType;
	struct ANativeWindow;		struct ANativeWindow;
	struct egl_native_pixmap_t;		struct egl_native_pixmap_t;

	typedef struct ANativeWindow* EGLNativeWindowType;
	typedef struct egl_native_pixmap_t* EGLNativePixmapType;
	typedef void* EGLNativeDisplayType;		typedef void* EGLNativeDisplayType;
			typedef struct egl_native_pixmap_t* EGLNativePixmapType;
			typedef struct ANativeWindow* EGLNativeWindowType;

	#elif defined(USE_OZONE)		#elif defined(USE_OZONE)

	typedef intptr_t EGLNativeDisplayType;		typedef intptr_t EGLNativeDisplayType;
	typedef intptr_t EGLNativeWindowType;
	typedef intptr_t EGLNativePixmapType;		typedef intptr_t EGLNativePixmapType;
			typedef intptr_t EGLNativeWindowType;

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

	/* X11 (tentative) */		/* X11 (tentative) */
	#include <X11/Xlib.h>		#include <X11/Xlib.h>
	@@ -120,11 +119,17 @@ typedef Display *EGLNativeDisplayType;
	typedef Pixmap EGLNativePixmapType;		typedef Pixmap EGLNativePixmapType;
	typedef Window EGLNativeWindowType;		typedef Window EGLNativeWindowType;

			#elif defined(__unix__)

			typedef void *EGLNativeDisplayType;
			typedef khronos_uintptr_t EGLNativePixmapType;
			typedef khronos_uintptr_t EGLNativeWindowType;

	#elif defined(__APPLE__)		#elif defined(__APPLE__)

	typedef int EGLNativeDisplayType;		typedef int EGLNativeDisplayType;
	typedef void *EGLNativeWindowType;
	typedef void *EGLNativePixmapType;		typedef void *EGLNativePixmapType;
			typedef void *EGLNativeWindowType;

	#elif defined(__HAIKU__)		#elif defined(__HAIKU__)

	@@ -134,6 +139,12 @@ typedef void *EGLNativeDisplayType;
	typedef khronos_uintptr_t EGLNativePixmapType;		typedef khronos_uintptr_t EGLNativePixmapType;
	typedef khronos_uintptr_t EGLNativeWindowType;		typedef khronos_uintptr_t EGLNativeWindowType;

			#elif defined(__Fuchsia__)

			typedef void *EGLNativeDisplayType;
			typedef khronos_uintptr_t EGLNativePixmapType;
			typedef khronos_uintptr_t EGLNativeWindowType;

	#else		#else
	#error "Platform not recognized"		#error "Platform not recognized"
	#endif		#endif

opengl/libs/EGL/eglApi.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -248,7 +248,7 @@ __eglMustCastToProperFunctionPointerType eglGetProcAddress(const char* procname)
	return cnx->platform.eglGetProcAddress(procname);		return cnx->platform.eglGetProcAddress(procname);
	}		}

	EGLBoolean eglSwapBuffersWithDamageKHR(EGLDisplay dpy, EGLSurface draw, EGLint* rects,		EGLBoolean eglSwapBuffersWithDamageKHR(EGLDisplay dpy, EGLSurface draw, const EGLint* rects,
	EGLint n_rects) {		EGLint n_rects) {
	ATRACE_CALL();		ATRACE_CALL();
	clearError();		clearError();

opengl/libs/EGL/egl_entries.in

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -106,5 +106,5 @@ EGL_ENTRY(EGLuint64NV, eglGetSystemTimeNV, void)

	/* Partial update extensions */		/* Partial update extensions */

	EGL_ENTRY(EGLBoolean, eglSwapBuffersWithDamageKHR, EGLDisplay, EGLSurface, EGLint *, EGLint)		EGL_ENTRY(EGLBoolean, eglSwapBuffersWithDamageKHR, EGLDisplay, EGLSurface, const EGLint *, EGLint)
	EGL_ENTRY(EGLBoolean, eglSetDamageRegionKHR, EGLDisplay, EGLSurface, EGLint *, EGLint)		EGL_ENTRY(EGLBoolean, eglSetDamageRegionKHR, EGLDisplay, EGLSurface, EGLint *, EGLint)