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

glad: Sync with upstream 0.1.31 

(cherry picked from commit 2bbcc521b6)
This commit is contained in:
Rémi Verschelde 2019-07-11 10:11:40 +02:00
parent cfa50d67d2
commit 0d2cb78f3e
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYRIGHT.txt
View File

@ -165,7 +165,7 @@ License: FTL
Files: ./thirdparty/glad/ Files: ./thirdparty/glad/
Comment: glad Comment: glad
Copyright: 2013-2018, David Herberth Copyright: 2013-2019, David Herberth
License: Expat License: Expat
Files: ./thirdparty/jpeg_compressor/ Files: ./thirdparty/jpeg_compressor/

2
thirdparty/README.md vendored
View File

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

12
thirdparty/glad/KHR/khrplatform.h vendored
View File

@ -90,12 +90,20 @@
* int arg2) KHRONOS_APIATTRIBUTES; * int arg2) KHRONOS_APIATTRIBUTES;
*/ */
#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
# define KHRONOS_STATIC 1
#endif
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Definition of KHRONOS_APICALL * Definition of KHRONOS_APICALL
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
* This precedes the return type of the function in the function prototype. * 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) # define KHRONOS_APICALL __declspec(dllimport)
#elif defined (__SYMBIAN32__) #elif defined (__SYMBIAN32__)
# define KHRONOS_APICALL IMPORT_C # define KHRONOS_APICALL IMPORT_C
@ -111,7 +119,7 @@
* This follows the return type of the function and precedes the function * This follows the return type of the function and precedes the function
* name in the function prototype. * 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 */ /* Win32 but not WinCE */
# define KHRONOS_APIENTRY __stdcall # define KHRONOS_APIENTRY __stdcall
#else #else

2
thirdparty/glad/glad.c vendored
View File

@ -1,6 +1,6 @@
/* /*
OpenGL loader generated by glad 0.1.29 on Mon Mar 4 12:47:22 2019. OpenGL loader generated by glad 0.1.31 on Thu Jul 11 10:09:18 2019.
Language/Generator: C/C++ Language/Generator: C/C++
Specification: gl Specification: gl

10
thirdparty/glad/glad/glad.h vendored
View File

@ -1,6 +1,6 @@
/* /*
OpenGL loader generated by glad 0.1.29 on Mon Mar 4 12:47:22 2019. OpenGL loader generated by glad 0.1.31 on Thu Jul 11 10:09:18 2019.
Language/Generator: C/C++ Language/Generator: C/C++
Specification: gl Specification: gl
@ -31,13 +31,7 @@
#define __gl_h_ #define __gl_h_
#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
#ifndef WIN32_LEAN_AND_MEAN #define APIENTRY __stdcall
#define WIN32_LEAN_AND_MEAN 1
#endif
#ifndef NOMINMAX
#define NOMINMAX 1
#endif
#include <windows.h>
#endif #endif
#ifndef APIENTRY #ifndef APIENTRY