diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-11 13:45:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-11 13:45:02 +0200 |
| commit | 36d587fc7f5061aebc34fa5168ec98e29f001ae2 (patch) | |
| tree | f932d0df8e469cfae206eb386064d383110bca17 /thirdparty | |
| parent | af5c02def84d91adca369169b7f903824b82589b (diff) | |
| parent | 2bbcc521b63acc3c380fc98d07adf8a8720edeb7 (diff) | |
Merge pull request #30512 from akien-mga/glad-0.1.31
glad: Sync with upstream 0.1.31
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/glad/KHR/khrplatform.h | 12 | ||||
| -rw-r--r-- | thirdparty/glad/glad.c | 2 | ||||
| -rw-r--r-- | thirdparty/glad/glad/glad.h | 10 |
4 files changed, 14 insertions, 12 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 0108e1387e..b20cc1fe8c 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.29 +- Version: 0.1.31 - License: MIT The files we package are automatically generated. diff --git a/thirdparty/glad/KHR/khrplatform.h b/thirdparty/glad/KHR/khrplatform.h index 975bbffed6..5b55ea2b98 100644 --- a/thirdparty/glad/KHR/khrplatform.h +++ b/thirdparty/glad/KHR/khrplatform.h @@ -90,12 +90,20 @@ * int arg2) KHRONOS_APIATTRIBUTES; */ +#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC) +# define KHRONOS_STATIC 1 +#endif + /*------------------------------------------------------------------------- * Definition of KHRONOS_APICALL *------------------------------------------------------------------------- * This precedes the return type of the function in the function prototype. */ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) +#if defined(KHRONOS_STATIC) + /* If the preprocessor constant KHRONOS_STATIC is defined, make the + * header compatible with static linking. */ +# define KHRONOS_APICALL +#elif defined(_WIN32) # define KHRONOS_APICALL __declspec(dllimport) #elif defined (__SYMBIAN32__) # define KHRONOS_APICALL IMPORT_C @@ -111,7 +119,7 @@ * This follows the return type of the function and precedes the function * name in the function prototype. */ -#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) +#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(KHRONOS_STATIC) /* Win32 but not WinCE */ # define KHRONOS_APIENTRY __stdcall #else diff --git a/thirdparty/glad/glad.c b/thirdparty/glad/glad.c index 9704c1079f..08c9c7e228 100644 --- a/thirdparty/glad/glad.c +++ b/thirdparty/glad/glad.c @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.29 on Wed May 1 23:16:34 2019. + OpenGL loader generated by glad 0.1.31 on Thu Jul 11 10:09:18 2019. Language/Generator: C/C++ Specification: gl diff --git a/thirdparty/glad/glad/glad.h b/thirdparty/glad/glad/glad.h index b398faf627..acf96d8cd9 100644 --- a/thirdparty/glad/glad/glad.h +++ b/thirdparty/glad/glad/glad.h @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.29 on Wed May 1 23:16:34 2019. + OpenGL loader generated by glad 0.1.31 on Thu Jul 11 10:09:18 2019. Language/Generator: C/C++ Specification: gl @@ -33,13 +33,7 @@ #define __gl_h_ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif -#ifndef NOMINMAX -#define NOMINMAX 1 -#endif -#include <windows.h> +#define APIENTRY __stdcall #endif #ifndef APIENTRY |