citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #3522 from jroweboy/update-glad 

Update GLAD GL bindings to include extensions
This commit is contained in:
James Rowe 2018-03-15 00:15:27 -06:00 committed by GitHub
parent 5748b3e47f a8dd3aa940
commit 0ad38cf3c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21329 additions and 1138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/glad/Readme.md vendored
View File

@ -1,5 +1,5 @@
These files were generated by the [glad](https://github.com/Dav1dde/glad) OpenGL loader generator and have been checked in as-is. You can re-generate them using glad with the following command: These files were generated by the [glad](https://github.com/Dav1dde/glad) OpenGL loader generator and have been checked in as-is. You can re-generate them using glad with the following command:
``` ```
python -m glad --profile core --out-path glad/ --api gl=3.3,gles=3.0 python -m glad --profile core --out-path glad/ --api gl=3.3 --generator=c
``` ```

4
externals/glad/include/KHR/khrplatform.h vendored
View File

@ -26,7 +26,7 @@
/* Khronos platform-specific types and definitions. /* Khronos platform-specific types and definitions.
* *
* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ * $Revision: 32517 $ on $Date: 2016-03-11 02:41:19 -0800 (Fri, 11 Mar 2016) $
* *
* Adopters may modify this file to suit their platform. Adopters are * Adopters may modify this file to suit their platform. Adopters are
* encouraged to submit platform specific modifications to the Khronos * encouraged to submit platform specific modifications to the Khronos
@ -101,6 +101,8 @@
# 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
#elif defined(__ANDROID__)
# define KHRONOS_APICALL __attribute__((visibility("default")))
#else #else
# define KHRONOS_APICALL # define KHRONOS_APICALL
#endif #endif

13755
externals/glad/include/glad/glad.h vendored
View File

File diff suppressed because one or more lines are too long

8704
externals/glad/src/glad.c vendored
View File

File diff suppressed because one or more lines are too long