2
0
Эх сурвалжийг харах

glad: Sync with upstream 0.1.33

(cherry picked from commit 92c3b6c85ef2268e20a4e072423f5eb902d7acef)
Rémi Verschelde 5 жил өмнө
parent
commit
699b087296

+ 1 - 1
thirdparty/README.md

@@ -131,7 +131,7 @@ Files extracted from upstream source:
 ## glad
 
 - Upstream: https://github.com/Dav1dde/glad
-- Version: 0.1.31
+- Version: 0.1.33
 - License: MIT
 
 The files we package are automatically generated.

+ 4 - 1
thirdparty/glad/glad.c

@@ -1,6 +1,6 @@
 /*
 
-    OpenGL loader generated by glad 0.1.31 on Thu Jul 11 10:09:18 2019.
+    OpenGL loader generated by glad 0.1.33 on Tue Nov 12 08:44:22 2019.
 
     Language/Generator: C/C++
     Specification: gl
@@ -29,6 +29,9 @@
 static void* get_proc(const char *namez);
 
 #if defined(_WIN32) || defined(__CYGWIN__)
+#ifndef _WINDOWS_
+#undef APIENTRY
+#endif
 #include <windows.h>
 static HMODULE libGL;
 

+ 2 - 2
thirdparty/glad/glad/glad.h

@@ -1,6 +1,6 @@
 /*
 
-    OpenGL loader generated by glad 0.1.31 on Thu Jul 11 10:09:18 2019.
+    OpenGL loader generated by glad 0.1.33 on Tue Nov 12 08:44:22 2019.
 
     Language/Generator: C/C++
     Specification: gl
@@ -3402,7 +3402,7 @@ GLAPI PFNGLWAITSYNCPROC glad_glWaitSync;
 typedef void (APIENTRYP PFNGLGETINTEGER64VPROC)(GLenum pname, GLint64 *data);
 GLAPI PFNGLGETINTEGER64VPROC glad_glGetInteger64v;
 #define glGetInteger64v glad_glGetInteger64v
-typedef void (APIENTRYP PFNGLGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLGETSYNCIVPROC)(GLsync sync, GLenum pname, GLsizei count, GLsizei *length, GLint *values);
 GLAPI PFNGLGETSYNCIVPROC glad_glGetSynciv;
 #define glGetSynciv glad_glGetSynciv
 typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC)(GLenum target, GLuint index, GLint64 *data);