godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "glad: Re-generate files with glad 2.0.6" 

This reverts commit 0f96251afe.

Fixes #90879.
This commit is contained in:
Rémi Verschelde 2024-04-29 13:37:23 +02:00
parent 271d7c8db7
commit beb798d01a
No known key found for this signature in database
GPG Key ID: C3336907360768E1
7 changed files with 97 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
thirdparty/README.md vendored
View File

@ -318,7 +318,7 @@ Files extracted from upstream source:
## glad ## glad
- Upstream: https://github.com/Dav1dde/glad - Upstream: https://github.com/Dav1dde/glad
- Version: 2.0.6 (658f48e72aee3c6582e80b05ac0f8787a64fe6bb, 2024) - Version: 2.0.4 (d08b1aa01f8fe57498f04d47b5fa8c48725be877, 2023)
- License: CC0 1.0 and Apache 2.0 - License: CC0 1.0 and Apache 2.0
Files extracted from upstream source: Files extracted from upstream source:
@ -334,11 +334,11 @@ Files generated from [upstream web instance](https://gen.glad.sh/):
- `glx.c` - `glx.c`
- `glad/glx.h` - `glad/glx.h`
See the permalinks in `glad/egl.h`, `glad/gl.h`, and `glad/glx.h` to regenrate See the permalinks in `glad/gl.h` and `glad/glx.h` to regenrate the files with
the files with a new version of the web instance. a new version of the web instance.
Some changes have been made in order to allow loading OpenGL and OpenGLES APIs Some changes have been made in order to allow loading OpenGL and OpenGLES APIs at the same time.
at the same time. See the patches in the `patches` directory. See the patches in the `patches` directory.
## glslang ## glslang

6
thirdparty/glad/EGL/eglplatform.h vendored
View File

@ -64,12 +64,6 @@ 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__) #elif defined(__EMSCRIPTEN__)
typedef int EGLNativeDisplayType; typedef int EGLNativeDisplayType;

147
thirdparty/glad/gl.c vendored
View File

@ -453,7 +453,6 @@ PFNGLMULTITEXCOORDP3UIPROC glad_glMultiTexCoordP3ui = NULL;
PFNGLMULTITEXCOORDP3UIVPROC glad_glMultiTexCoordP3uiv = NULL; PFNGLMULTITEXCOORDP3UIVPROC glad_glMultiTexCoordP3uiv = NULL;
PFNGLMULTITEXCOORDP4UIPROC glad_glMultiTexCoordP4ui = NULL; PFNGLMULTITEXCOORDP4UIPROC glad_glMultiTexCoordP4ui = NULL;
PFNGLMULTITEXCOORDP4UIVPROC glad_glMultiTexCoordP4uiv = NULL; PFNGLMULTITEXCOORDP4UIVPROC glad_glMultiTexCoordP4uiv = NULL;
PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC glad_glNamedFramebufferTextureMultiviewOVR = NULL;
PFNGLNEWLISTPROC glad_glNewList = NULL; PFNGLNEWLISTPROC glad_glNewList = NULL;
PFNGLNORMAL3BPROC glad_glNormal3b = NULL; PFNGLNORMAL3BPROC glad_glNormal3b = NULL;
PFNGLNORMAL3BVPROC glad_glNormal3bv = NULL; PFNGLNORMAL3BVPROC glad_glNormal3bv = NULL;
@ -2109,29 +2108,40 @@ static void glad_gl_load_GL_EXT_framebuffer_object( GLADuserptrloadfunc load, vo
static void glad_gl_load_GL_OVR_multiview( GLADuserptrloadfunc load, void* userptr) { static void glad_gl_load_GL_OVR_multiview( GLADuserptrloadfunc load, void* userptr) {
if(!GLAD_GL_OVR_multiview) return; if(!GLAD_GL_OVR_multiview) return;
glad_glFramebufferTextureMultiviewOVR = (PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) load(userptr, "glFramebufferTextureMultiviewOVR"); glad_glFramebufferTextureMultiviewOVR = (PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) load(userptr, "glFramebufferTextureMultiviewOVR");
glad_glNamedFramebufferTextureMultiviewOVR = (PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) load(userptr, "glNamedFramebufferTextureMultiviewOVR");
} }
static void glad_gl_free_extensions(char **exts_i) {
if (exts_i != NULL) {
unsigned int index;
for(index = 0; exts_i[index]; index++) {
free((void *) (exts_i[index]));
}
free((void *)exts_i);
exts_i = NULL;
}
}
static int glad_gl_get_extensions( const char **out_exts, char ***out_exts_i) {
#if defined(GL_ES_VERSION_3_0) || defined(GL_VERSION_3_0) #if defined(GL_ES_VERSION_3_0) || defined(GL_VERSION_3_0)
if (glad_glGetStringi != NULL && glad_glGetIntegerv != NULL) { #define GLAD_GL_IS_SOME_NEW_VERSION 1
#else
#define GLAD_GL_IS_SOME_NEW_VERSION 0
#endif
static int glad_gl_get_extensions( int version, const char **out_exts, unsigned int *out_num_exts_i, char ***out_exts_i) {
#if GLAD_GL_IS_SOME_NEW_VERSION
if(GLAD_VERSION_MAJOR(version) < 3) {
#else
GLAD_UNUSED(version);
GLAD_UNUSED(out_num_exts_i);
GLAD_UNUSED(out_exts_i);
#endif
if (glad_glGetString == NULL) {
return 0;
}
*out_exts = (const char *)glad_glGetString(GL_EXTENSIONS);
#if GLAD_GL_IS_SOME_NEW_VERSION
} else {
unsigned int index = 0; unsigned int index = 0;
unsigned int num_exts_i = 0; unsigned int num_exts_i = 0;
char **exts_i = NULL; char **exts_i = NULL;
if (glad_glGetStringi == NULL || glad_glGetIntegerv == NULL) {
return 0;
}
glad_glGetIntegerv(GL_NUM_EXTENSIONS, (int*) &num_exts_i); glad_glGetIntegerv(GL_NUM_EXTENSIONS, (int*) &num_exts_i);
exts_i = (char **) malloc((num_exts_i + 1) * (sizeof *exts_i)); if (num_exts_i > 0) {
exts_i = (char **) malloc(num_exts_i * (sizeof *exts_i));
}
if (exts_i == NULL) { if (exts_i == NULL) {
return 0; return 0;
} }
@ -2140,40 +2150,31 @@ static int glad_gl_get_extensions( const char **out_exts, char ***out_exts_i) {
size_t len = strlen(gl_str_tmp) + 1; size_t len = strlen(gl_str_tmp) + 1;
char *local_str = (char*) malloc(len * sizeof(char)); char *local_str = (char*) malloc(len * sizeof(char));
if(local_str == NULL) { if(local_str != NULL) {
exts_i[index] = NULL; memcpy(local_str, gl_str_tmp, len * sizeof(char));
glad_gl_free_extensions(exts_i);
return 0;
} }
memcpy(local_str, gl_str_tmp, len * sizeof(char));
exts_i[index] = local_str; exts_i[index] = local_str;
} }
exts_i[index] = NULL;
*out_num_exts_i = num_exts_i;
*out_exts_i = exts_i; *out_exts_i = exts_i;
return 1;
} }
#else
GLAD_UNUSED(out_exts_i);
#endif #endif
if (glad_glGetString == NULL) {
return 0;
}
*out_exts = (const char *)glad_glGetString(GL_EXTENSIONS);
return 1; return 1;
} }
static int glad_gl_has_extension(const char *exts, char **exts_i, const char *ext) { static void glad_gl_free_extensions(char **exts_i, unsigned int num_exts_i) {
if(exts_i) { if (exts_i != NULL) {
unsigned int index; unsigned int index;
for(index = 0; exts_i[index]; index++) { for(index = 0; index < num_exts_i; index++) {
const char *e = exts_i[index]; free((void *) (exts_i[index]));
if(strcmp(e, ext) == 0) {
return 1;
}
} }
} else { free((void *)exts_i);
exts_i = NULL;
}
}
static int glad_gl_has_extension(int version, const char *exts, unsigned int num_exts_i, char **exts_i, const char *ext) {
if(GLAD_VERSION_MAJOR(version) < 3 || !GLAD_GL_IS_SOME_NEW_VERSION) {
const char *extensions; const char *extensions;
const char *loc; const char *loc;
const char *terminator; const char *terminator;
@ -2193,6 +2194,14 @@ static int glad_gl_has_extension(const char *exts, char **exts_i, const char *ex
} }
extensions = terminator; extensions = terminator;
} }
} else {
unsigned int index;
for(index = 0; index < num_exts_i; index++) {
const char *e = exts_i[index];
if(strcmp(e, ext) == 0) {
return 1;
}
}
} }
return 0; return 0;
} }
@ -2201,21 +2210,22 @@ static GLADapiproc glad_gl_get_proc_from_userptr(void *userptr, const char* name
return (GLAD_GNUC_EXTENSION (GLADapiproc (*)(const char *name)) userptr)(name); return (GLAD_GNUC_EXTENSION (GLADapiproc (*)(const char *name)) userptr)(name);
} }
static int glad_gl_find_extensions_gl(void) { static int glad_gl_find_extensions_gl( int version) {
const char *exts = NULL; const char *exts = NULL;
unsigned int num_exts_i = 0;
char **exts_i = NULL; char **exts_i = NULL;
if (!glad_gl_get_extensions(&exts, &exts_i)) return 0; if (!glad_gl_get_extensions(version, &exts, &num_exts_i, &exts_i)) return 0;
GLAD_GL_ARB_debug_output = glad_gl_has_extension(exts, exts_i, "GL_ARB_debug_output"); GLAD_GL_ARB_debug_output = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_ARB_debug_output");
GLAD_GL_ARB_framebuffer_object = glad_gl_has_extension(exts, exts_i, "GL_ARB_framebuffer_object"); GLAD_GL_ARB_framebuffer_object = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_ARB_framebuffer_object");
GLAD_GL_ARB_get_program_binary = glad_gl_has_extension(exts, exts_i, "GL_ARB_get_program_binary"); GLAD_GL_ARB_get_program_binary = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_ARB_get_program_binary");
GLAD_GL_EXT_framebuffer_blit = glad_gl_has_extension(exts, exts_i, "GL_EXT_framebuffer_blit"); GLAD_GL_EXT_framebuffer_blit = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_framebuffer_blit");
GLAD_GL_EXT_framebuffer_multisample = glad_gl_has_extension(exts, exts_i, "GL_EXT_framebuffer_multisample"); GLAD_GL_EXT_framebuffer_multisample = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_framebuffer_multisample");
GLAD_GL_EXT_framebuffer_object = glad_gl_has_extension(exts, exts_i, "GL_EXT_framebuffer_object"); GLAD_GL_EXT_framebuffer_object = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_EXT_framebuffer_object");
GLAD_GL_OVR_multiview = glad_gl_has_extension(exts, exts_i, "GL_OVR_multiview"); GLAD_GL_OVR_multiview = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OVR_multiview");
GLAD_GL_OVR_multiview2 = glad_gl_has_extension(exts, exts_i, "GL_OVR_multiview2"); GLAD_GL_OVR_multiview2 = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OVR_multiview2");
glad_gl_free_extensions(exts_i); glad_gl_free_extensions(exts_i, num_exts_i);
return 1; return 1;
} }
@ -2265,6 +2275,7 @@ int gladLoadGLUserPtr( GLADuserptrloadfunc load, void *userptr) {
glad_glGetString = (PFNGLGETSTRINGPROC) load(userptr, "glGetString"); glad_glGetString = (PFNGLGETSTRINGPROC) load(userptr, "glGetString");
if(glad_glGetString == NULL) return 0; if(glad_glGetString == NULL) return 0;
if(glad_glGetString(GL_VERSION) == NULL) return 0;
version = glad_gl_find_core_gl(); version = glad_gl_find_core_gl();
glad_gl_load_GL_VERSION_1_0(load, userptr); glad_gl_load_GL_VERSION_1_0(load, userptr);
@ -2280,7 +2291,7 @@ int gladLoadGLUserPtr( GLADuserptrloadfunc load, void *userptr) {
glad_gl_load_GL_VERSION_3_2(load, userptr); glad_gl_load_GL_VERSION_3_2(load, userptr);
glad_gl_load_GL_VERSION_3_3(load, userptr); glad_gl_load_GL_VERSION_3_3(load, userptr);
if (!glad_gl_find_extensions_gl()) return 0; if (!glad_gl_find_extensions_gl(version)) return 0;
glad_gl_load_GL_ARB_debug_output(load, userptr); glad_gl_load_GL_ARB_debug_output(load, userptr);
glad_gl_load_GL_ARB_framebuffer_object(load, userptr); glad_gl_load_GL_ARB_framebuffer_object(load, userptr);
glad_gl_load_GL_ARB_get_program_binary(load, userptr); glad_gl_load_GL_ARB_get_program_binary(load, userptr);
@ -2299,15 +2310,16 @@ int gladLoadGL( GLADloadfunc load) {
return gladLoadGLUserPtr( glad_gl_get_proc_from_userptr, GLAD_GNUC_EXTENSION (void*) load); return gladLoadGLUserPtr( glad_gl_get_proc_from_userptr, GLAD_GNUC_EXTENSION (void*) load);
} }
static int glad_gl_find_extensions_gles2(void) { static int glad_gl_find_extensions_gles2( int version) {
const char *exts = NULL; const char *exts = NULL;
unsigned int num_exts_i = 0;
char **exts_i = NULL; char **exts_i = NULL;
if (!glad_gl_get_extensions(&exts, &exts_i)) return 0; if (!glad_gl_get_extensions(version, &exts, &num_exts_i, &exts_i)) return 0;
GLAD_GL_OVR_multiview = glad_gl_has_extension(exts, exts_i, "GL_OVR_multiview"); GLAD_GL_OVR_multiview = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OVR_multiview");
GLAD_GL_OVR_multiview2 = glad_gl_has_extension(exts, exts_i, "GL_OVR_multiview2"); GLAD_GL_OVR_multiview2 = glad_gl_has_extension(version, exts, num_exts_i, exts_i, "GL_OVR_multiview2");
glad_gl_free_extensions(exts_i); glad_gl_free_extensions(exts_i, num_exts_i);
return 1; return 1;
} }
@ -2349,6 +2361,7 @@ int gladLoadGLES2UserPtr( GLADuserptrloadfunc load, void *userptr) {
glad_glGetString = (PFNGLGETSTRINGPROC) load(userptr, "glGetString"); glad_glGetString = (PFNGLGETSTRINGPROC) load(userptr, "glGetString");
if(glad_glGetString == NULL) return 0; if(glad_glGetString == NULL) return 0;
if(glad_glGetString(GL_VERSION) == NULL) return 0;
version = glad_gl_find_core_gles2(); version = glad_gl_find_core_gles2();
glad_gl_load_GL_ES_VERSION_2_0(load, userptr); glad_gl_load_GL_ES_VERSION_2_0(load, userptr);
@ -2356,7 +2369,7 @@ int gladLoadGLES2UserPtr( GLADuserptrloadfunc load, void *userptr) {
glad_gl_load_GL_ES_VERSION_3_1(load, userptr); glad_gl_load_GL_ES_VERSION_3_1(load, userptr);
glad_gl_load_GL_ES_VERSION_3_2(load, userptr); glad_gl_load_GL_ES_VERSION_3_2(load, userptr);
if (!glad_gl_find_extensions_gles2()) return 0; if (!glad_gl_find_extensions_gles2(version)) return 0;
glad_gl_load_GL_OVR_multiview(load, userptr); glad_gl_load_GL_OVR_multiview(load, userptr);
@ -2614,9 +2627,10 @@ static GLADapiproc glad_dlsym_handle(void* handle, const char *name) {
typedef __eglMustCastToProperFunctionPointerType (GLAD_API_PTR *PFNEGLGETPROCADDRESSPROC)(const char *name); typedef __eglMustCastToProperFunctionPointerType (GLAD_API_PTR *PFNEGLGETPROCADDRESSPROC)(const char *name);
#endif #endif
extern __eglMustCastToProperFunctionPointerType emscripten_GetProcAddress(const char *name); extern __eglMustCastToProperFunctionPointerType emscripten_GetProcAddress(const char *name);
#elif defined(GLAD_GLES2_USE_SYSTEM_EGL) #elif EGL_STATIC
#include <EGL/egl.h> typedef void (*__eglMustCastToProperFunctionPointerType)(void);
typedef __eglMustCastToProperFunctionPointerType (GLAD_API_PTR *PFNEGLGETPROCADDRESSPROC)(const char *name); typedef __eglMustCastToProperFunctionPointerType (GLAD_API_PTR *PFNEGLGETPROCADDRESSPROC)(const char *name);
extern __eglMustCastToProperFunctionPointerType GLAD_API_PTR eglGetProcAddress(const char *name);
#else #else
#include <glad/egl.h> #include <glad/egl.h>
#endif #endif
@ -2644,7 +2658,7 @@ static GLADapiproc glad_gles2_get_proc(void *vuserptr, const char* name) {
return result; return result;
} }
static void* _glad_GLES2_loader_handle = NULL; static void* _glad_GL_loader_handle = NULL;
static void* glad_gles2_dlopen_handle(void) { static void* glad_gles2_dlopen_handle(void) {
#if GLAD_PLATFORM_EMSCRIPTEN #if GLAD_PLATFORM_EMSCRIPTEN
@ -2660,11 +2674,11 @@ static void* glad_gles2_dlopen_handle(void) {
GLAD_UNUSED(glad_get_dlopen_handle); GLAD_UNUSED(glad_get_dlopen_handle);
return NULL; return NULL;
#else #else
if (_glad_GLES2_loader_handle == NULL) { if (_glad_GL_loader_handle == NULL) {
_glad_GLES2_loader_handle = glad_get_dlopen_handle(NAMES, sizeof(NAMES) / sizeof(NAMES[0])); _glad_GL_loader_handle = glad_get_dlopen_handle(NAMES, sizeof(NAMES) / sizeof(NAMES[0]));
} }
return _glad_GLES2_loader_handle; return _glad_GL_loader_handle;
#endif #endif
} }
@ -2694,12 +2708,11 @@ int gladLoaderLoadGLES2(void) {
userptr.get_proc_address_ptr = emscripten_GetProcAddress; userptr.get_proc_address_ptr = emscripten_GetProcAddress;
version = gladLoadGLES2UserPtr(glad_gles2_get_proc, &userptr); version = gladLoadGLES2UserPtr(glad_gles2_get_proc, &userptr);
#else #else
#ifndef GLAD_GLES2_USE_SYSTEM_EGL
if (eglGetProcAddress == NULL) { if (eglGetProcAddress == NULL) {
return 0; return 0;
} }
#endif
did_load = _glad_GLES2_loader_handle == NULL; did_load = _glad_GL_loader_handle == NULL;
handle = glad_gles2_dlopen_handle(); handle = glad_gles2_dlopen_handle();
if (handle != NULL) { if (handle != NULL) {
userptr = glad_gles2_build_userptr(handle); userptr = glad_gles2_build_userptr(handle);
@ -2718,9 +2731,9 @@ int gladLoaderLoadGLES2(void) {
void gladLoaderUnloadGLES2(void) { void gladLoaderUnloadGLES2(void) {
if (_glad_GLES2_loader_handle != NULL) { if (_glad_GL_loader_handle != NULL) {
glad_close_dlopen_handle(_glad_GLES2_loader_handle); glad_close_dlopen_handle(_glad_GL_loader_handle);
_glad_GLES2_loader_handle = NULL; _glad_GL_loader_handle = NULL;
} }
} }

4
thirdparty/glad/glad/egl.h vendored
View File

@ -1,5 +1,5 @@
/** /**
* Loader generated by glad 2.0.6 on Fri Apr 5 08:17:09 2024 * Loader generated by glad 2.0.3 on Fri Feb 3 07:06:48 2023
* *
* SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0
* *
@ -141,7 +141,7 @@ extern "C" {
#define GLAD_VERSION_MAJOR(version) (version / 10000) #define GLAD_VERSION_MAJOR(version) (version / 10000)
#define GLAD_VERSION_MINOR(version) (version % 10000) #define GLAD_VERSION_MINOR(version) (version % 10000)
#define GLAD_GENERATOR_VERSION "2.0.6" #define GLAD_GENERATOR_VERSION "2.0.3"
typedef void (*GLADapiproc)(void); typedef void (*GLADapiproc)(void);

7
thirdparty/glad/glad/gl.h vendored
View File

@ -1,5 +1,5 @@
/** /**
* Loader generated by glad 2.0.6 on Fri Apr 5 08:14:44 2024 * Loader generated by glad 2.0.4 on Mon May 22 13:18:29 2023
* *
* SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0
* *
@ -178,7 +178,7 @@ extern "C" {
#define GLAD_VERSION_MAJOR(version) (version / 10000) #define GLAD_VERSION_MAJOR(version) (version / 10000)
#define GLAD_VERSION_MINOR(version) (version % 10000) #define GLAD_VERSION_MINOR(version) (version % 10000)
#define GLAD_GENERATOR_VERSION "2.0.6" #define GLAD_GENERATOR_VERSION "2.0.4"
typedef void (*GLADapiproc)(void); typedef void (*GLADapiproc)(void);
@ -2394,7 +2394,6 @@ typedef void (GLAD_API_PTR *PFNGLMULTITEXCOORDP3UIPROC)(GLenum texture, GLenum t
typedef void (GLAD_API_PTR *PFNGLMULTITEXCOORDP3UIVPROC)(GLenum texture, GLenum type, const GLuint * coords); typedef void (GLAD_API_PTR *PFNGLMULTITEXCOORDP3UIVPROC)(GLenum texture, GLenum type, const GLuint * coords);
typedef void (GLAD_API_PTR *PFNGLMULTITEXCOORDP4UIPROC)(GLenum texture, GLenum type, GLuint coords); typedef void (GLAD_API_PTR *PFNGLMULTITEXCOORDP4UIPROC)(GLenum texture, GLenum type, GLuint coords);
typedef void (GLAD_API_PTR *PFNGLMULTITEXCOORDP4UIVPROC)(GLenum texture, GLenum type, const GLuint * coords); typedef void (GLAD_API_PTR *PFNGLMULTITEXCOORDP4UIVPROC)(GLenum texture, GLenum type, const GLuint * coords);
typedef void (GLAD_API_PTR *PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC)(GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews);
typedef void (GLAD_API_PTR *PFNGLNEWLISTPROC)(GLuint list, GLenum mode); typedef void (GLAD_API_PTR *PFNGLNEWLISTPROC)(GLuint list, GLenum mode);
typedef void (GLAD_API_PTR *PFNGLNORMAL3BPROC)(GLbyte nx, GLbyte ny, GLbyte nz); typedef void (GLAD_API_PTR *PFNGLNORMAL3BPROC)(GLbyte nx, GLbyte ny, GLbyte nz);
typedef void (GLAD_API_PTR *PFNGLNORMAL3BVPROC)(const GLbyte * v); typedef void (GLAD_API_PTR *PFNGLNORMAL3BVPROC)(const GLbyte * v);
@ -3655,8 +3654,6 @@ GLAD_API_CALL PFNGLMULTITEXCOORDP4UIPROC glad_glMultiTexCoordP4ui;
#define glMultiTexCoordP4ui glad_glMultiTexCoordP4ui #define glMultiTexCoordP4ui glad_glMultiTexCoordP4ui
GLAD_API_CALL PFNGLMULTITEXCOORDP4UIVPROC glad_glMultiTexCoordP4uiv; GLAD_API_CALL PFNGLMULTITEXCOORDP4UIVPROC glad_glMultiTexCoordP4uiv;
#define glMultiTexCoordP4uiv glad_glMultiTexCoordP4uiv #define glMultiTexCoordP4uiv glad_glMultiTexCoordP4uiv
GLAD_API_CALL PFNGLNAMEDFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC glad_glNamedFramebufferTextureMultiviewOVR;
#define glNamedFramebufferTextureMultiviewOVR glad_glNamedFramebufferTextureMultiviewOVR
GLAD_API_CALL PFNGLNEWLISTPROC glad_glNewList; GLAD_API_CALL PFNGLNEWLISTPROC glad_glNewList;
#define glNewList glad_glNewList #define glNewList glad_glNewList
GLAD_API_CALL PFNGLNORMAL3BPROC glad_glNormal3b; GLAD_API_CALL PFNGLNORMAL3BPROC glad_glNormal3b;

4
thirdparty/glad/glad/glx.h vendored
View File

@ -1,5 +1,5 @@
/** /**
* Loader generated by glad 2.0.6 on Fri Apr 5 08:14:31 2024 * Loader generated by glad 2.0.4 on Mon May 22 13:18:29 2023
* *
* SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0 * SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0
* *
@ -152,7 +152,7 @@ extern "C" {
#define GLAD_VERSION_MAJOR(version) (version / 10000) #define GLAD_VERSION_MAJOR(version) (version / 10000)
#define GLAD_VERSION_MINOR(version) (version % 10000) #define GLAD_VERSION_MINOR(version) (version % 10000)
#define GLAD_GENERATOR_VERSION "2.0.6" #define GLAD_GENERATOR_VERSION "2.0.4"
typedef void (*GLADapiproc)(void); typedef void (*GLADapiproc)(void);

12
thirdparty/glad/patches/patch_enable_both_gl_and_gles.diff vendored
View File

@ -1,8 +1,8 @@
diff --git a/thirdparty/glad/gl.c b/thirdparty/glad/gl.c diff --git a/thirdparty/glad/gl.c b/thirdparty/glad/gl.c
index 3f0884a3dc..38ecb514bd 100644 index a0b59dbbfb..9f10f6544a 100644
--- a/thirdparty/glad/gl.c --- a/thirdparty/glad/gl.c
+++ b/thirdparty/glad/gl.c +++ b/thirdparty/glad/gl.c
@@ -2462,7 +2462,7 @@ static GLADapiproc glad_gl_get_proc(void *vuserptr, const char *name) { @@ -2475,7 +2475,7 @@ static GLADapiproc glad_gl_get_proc(void *vuserptr, const char *name) {
return result; return result;
} }
@ -11,7 +11,7 @@ index 3f0884a3dc..38ecb514bd 100644
static void* glad_gl_dlopen_handle(void) { static void* glad_gl_dlopen_handle(void) {
#if GLAD_PLATFORM_APPLE #if GLAD_PLATFORM_APPLE
@@ -2484,11 +2484,11 @@ static void* glad_gl_dlopen_handle(void) { @@ -2497,11 +2497,11 @@ static void* glad_gl_dlopen_handle(void) {
}; };
#endif #endif
@ -26,7 +26,7 @@ index 3f0884a3dc..38ecb514bd 100644
} }
static struct _glad_gl_userptr glad_gl_build_userptr(void *handle) { static struct _glad_gl_userptr glad_gl_build_userptr(void *handle) {
@@ -2514,7 +2514,7 @@ int gladLoaderLoadGL(void) { @@ -2527,7 +2527,7 @@ int gladLoaderLoadGL(void) {
int did_load = 0; int did_load = 0;
struct _glad_gl_userptr userptr; struct _glad_gl_userptr userptr;
@ -35,7 +35,7 @@ index 3f0884a3dc..38ecb514bd 100644
handle = glad_gl_dlopen_handle(); handle = glad_gl_dlopen_handle();
if (handle) { if (handle) {
userptr = glad_gl_build_userptr(handle); userptr = glad_gl_build_userptr(handle);
@@ -2532,9 +2532,9 @@ int gladLoaderLoadGL(void) { @@ -2545,9 +2545,9 @@ int gladLoaderLoadGL(void) {
void gladLoaderUnloadGL(void) { void gladLoaderUnloadGL(void) {
@ -49,7 +49,7 @@ index 3f0884a3dc..38ecb514bd 100644
} }
diff --git a/thirdparty/glad/glad/gl.h b/thirdparty/glad/glad/gl.h diff --git a/thirdparty/glad/glad/gl.h b/thirdparty/glad/glad/gl.h
index 77c6f33cab..1301d10b65 100644 index 905c16aeed..f3cb7d8cb5 100644
--- a/thirdparty/glad/glad/gl.h --- a/thirdparty/glad/glad/gl.h
+++ b/thirdparty/glad/glad/gl.h +++ b/thirdparty/glad/glad/gl.h
@@ -67,6 +67,7 @@ @@ -67,6 +67,7 @@