diff --git a/thirdparty/README.md b/thirdparty/README.md index c99c2165f6..32528b1146 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -135,7 +135,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. diff --git a/thirdparty/glad/glad.c b/thirdparty/glad/glad.c index 08c9c7e228..a1fe4d25ef 100644 --- a/thirdparty/glad/glad.c +++ b/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 @@ -31,6 +31,9 @@ static void* get_proc(const char *namez); #if defined(_WIN32) || defined(__CYGWIN__) +#ifndef _WINDOWS_ +#undef APIENTRY +#endif #include static HMODULE libGL; diff --git a/thirdparty/glad/glad/glad.h b/thirdparty/glad/glad/glad.h index acf96d8cd9..fae71a865e 100644 --- a/thirdparty/glad/glad/glad.h +++ b/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 @@ -3404,7 +3404,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);