From 5dfdc5a6dc60a3bdc63cd4510dabacba388da13a Mon Sep 17 00:00:00 2001

From: Kyle Brenneman <kbrenneman@nvidia.com>

Date: Tue, 22 Oct 2019 16:46:09 -0600

Subject: [PATCH] Update GL/gl.h to match Mesa.

Updated GL/gl.h to match the copy from Mesa at commit

a0829cf23b307ca44ab8c4505974fb7c8d71a35a.

---

 include/GL/gl.h | 147 ++++++------------------------------------------

 1 file changed, 17 insertions(+), 130 deletions(-)

diff --git a/include/GL/gl.h b/include/GL/gl.h

index 3f8cb62..2518dfb 100644

--- a/include/GL/gl.h

+++ b/include/GL/gl.h

@@ -27,40 +27,24 @@

 #ifndef __gl_h_

 #define __gl_h_

-#if defined(USE_MGL_NAMESPACE)

-#include "gl_mangle.h"

-#endif

-

-

 /**********************************************************************

- * Begin system-specific stuff. Do not do any of this when building

- * for SciTech SNAP, as this is all done before this header file is

- * included. 

+ * Begin system-specific stuff.

  */

-#if !defined(__SCITECH_SNAP__)

-

-#if defined(__BEOS__)

-#include <stdlib.h>     /* to get some BeOS-isms */

-#endif

-

-#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO))

-#define OPENSTEP

-#endif

 #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)

 #define __WIN32__

 #endif

-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__))

+#if defined(__WIN32__) && !defined(__CYGWIN__)

 #  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */

 #    define GLAPI __declspec(dllexport)

 #  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */

 #    define GLAPI __declspec(dllimport)

 #  else /* for use with static link lib build of Win32 edition only */

 #    define GLAPI extern

-#  endif /* _STATIC_MESA support */

+#  endif

 #  if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE)  /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */

-#    define GLAPIENTRY 

+#    define GLAPIENTRY

 #  else

 #    define GLAPIENTRY __stdcall

 #  endif

@@ -72,10 +56,6 @@

 #  define GLAPIENTRY

 #endif /* WIN32 && !CYGWIN */

-#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__)

-#  define PRAGMA_EXPORT_SUPPORTED		1

-#endif

-

 /*

  * WINDOWS: Include windows.h here to define APIENTRY.

  * It is also useful when applications include this file by

@@ -91,10 +71,6 @@

 #include <windows.h>

 #endif

-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED

-#pragma import on

-#endif

-

 #ifndef GLAPI

 #define GLAPI extern

 #endif

@@ -116,15 +92,6 @@

 #define GLAPIENTRYP GLAPIENTRY *

 #endif

-#ifdef CENTERLINE_CLPP

-#define signed

-#endif

-

-#if defined(PRAGMA_EXPORT_SUPPORTED)

-#pragma export on

-#endif

-

-#endif /* !__SCITECH_SNAP__ */

 /*

  * End system-specific stuff.

  **********************************************************************/

@@ -718,7 +685,7 @@ typedef double		GLclampd;	/* double precision float in [0,1] */

 #define GL_LIST_BIT				0x00020000

 #define GL_TEXTURE_BIT				0x00040000

 #define GL_SCISSOR_BIT				0x00080000

-#define GL_ALL_ATTRIB_BITS			0x000FFFFF

+#define GL_ALL_ATTRIB_BITS			0xFFFFFFFF

 /* OpenGL 1.1 */

@@ -1738,6 +1705,7 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,

+

 /*

  * OpenGL 1.3

  */

@@ -2085,26 +2053,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh

-#if GL_ARB_shader_objects

-

-#ifndef GL_MESA_shader_debug

-#define GL_MESA_shader_debug 1

-

-#define GL_DEBUG_OBJECT_MESA              0x8759

-#define GL_DEBUG_PRINT_MESA               0x875A

-#define GL_DEBUG_ASSERT_MESA              0x875B

-

-GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void);

-GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);

-GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength,

-                                         GLsizei *length, GLcharARB *debugLog);

-GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType);

-

-#endif /* GL_MESA_shader_debug */

-

-#endif /* GL_ARB_shader_objects */

-

-

 /*

  * ???. GL_MESA_packed_depth_stencil

  * XXX obsolete

@@ -2121,60 +2069,6 @@ GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logTyp

 #endif /* GL_MESA_packed_depth_stencil */

-#ifndef GL_MESA_program_debug

-#define GL_MESA_program_debug 1

-

-#define GL_FRAGMENT_PROGRAM_POSITION_MESA       0x8bb0

-#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA       0x8bb1

-#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA  0x8bb2

-#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA  0x8bb3

-#define GL_VERTEX_PROGRAM_POSITION_MESA         0x8bb4

-#define GL_VERTEX_PROGRAM_CALLBACK_MESA         0x8bb5

-#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA    0x8bb6

-#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA    0x8bb7

-

-typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data);

-

-GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data);

-

-GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v);

-

-#endif /* GL_MESA_program_debug */

-

-

-#ifndef GL_MESA_texture_array

-#define GL_MESA_texture_array 1

-

-/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array.

- */

-#ifndef GL_EXT_texture_array

-

-#ifdef GL_GLEXT_PROTOTYPES

-GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target,

-    GLenum attachment, GLuint texture, GLint level, GLint layer);

-#endif /* GL_GLEXT_PROTOTYPES */

-

-#if 0

-/* (temporarily) disabled because of collision with typedef in glext.h

- * that happens if apps include both gl.h and glext.h

- */

-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target,

-    GLenum attachment, GLuint texture, GLint level, GLint layer);

-#endif

-

-#define GL_TEXTURE_1D_ARRAY_EXT         0x8C18

-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT   0x8C19

-#define GL_TEXTURE_2D_ARRAY_EXT         0x8C1A

-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT   0x8C1B

-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C

-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D

-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF

-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4

-#endif

-

-#endif

-

-

 #ifndef GL_ATI_blend_equation_separate

 #define GL_ATI_blend_equation_separate 1

@@ -2186,27 +2080,20 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen

 #endif /* GL_ATI_blend_equation_separate */

-/**

- ** NOTE!!!!!  If you add new functions to this file, or update

- ** glext.h be sure to regenerate the gl_mangle.h file.  See comments

- ** in that file for details.

- **/

-

-

-

-/**********************************************************************

- * Begin system-specific stuff

- */

-#if defined(PRAGMA_EXPORT_SUPPORTED)

-#pragma export off

+/* GL_OES_EGL_image */

+#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage)

+typedef void* GLeglImageOES;

 #endif

-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED

-#pragma import off

+#ifndef GL_OES_EGL_image

+#define GL_OES_EGL_image 1

+#ifdef GL_GLEXT_PROTOTYPES

+GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);

+GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);

+#endif

+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);

+typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);

 #endif

-/*

- * End system-specific stuff

- **********************************************************************/

 #ifdef __cplusplus

-- 

2.22.0