Browse Source
Merge pull request #2505 from ReinUsesLisp/glad-update
externals: Update glad to support OpenGL 4.6 compatibility profile
pull/15/merge
bunnei
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
6628 additions and
4187 deletions
-
externals/glad/include/KHR/khrplatform.h
-
externals/glad/include/glad/glad.h
-
externals/glad/src/glad.c
|
|
|
@ -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 |
|
|
|
|