glad: Sync with upstream 0.1.31
This commit is contained in:
parent
49ce6bacc3
commit
2bbcc521b6
5 changed files with 15 additions and 13 deletions
|
@ -170,7 +170,7 @@ License: FTL
|
|||
|
||||
Files: ./thirdparty/glad/
|
||||
Comment: glad
|
||||
Copyright: 2013-2018, David Herberth
|
||||
Copyright: 2013-2019, David Herberth
|
||||
License: Expat
|
||||
|
||||
Files: ./thirdparty/jpeg_compressor/
|
||||
|
|
2
thirdparty/README.md
vendored
2
thirdparty/README.md
vendored
|
@ -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.
|
||||
|
|
12
thirdparty/glad/KHR/khrplatform.h
vendored
12
thirdparty/glad/KHR/khrplatform.h
vendored
|
@ -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
|
||||
|
|
2
thirdparty/glad/glad.c
vendored
2
thirdparty/glad/glad.c
vendored
|
@ -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
|
||||
|
|
10
thirdparty/glad/glad/glad.h
vendored
10
thirdparty/glad/glad/glad.h
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue