Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
2bbcc521
Commit
2bbcc521
authored
Jul 11, 2019
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
glad: Sync with upstream 0.1.31
parent
49ce6bac
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
13 deletions
+15
-13
COPYRIGHT.txt
COPYRIGHT.txt
+1
-1
README.md
thirdparty/README.md
+1
-1
khrplatform.h
thirdparty/glad/KHR/khrplatform.h
+10
-2
glad.c
thirdparty/glad/glad.c
+1
-1
glad.h
thirdparty/glad/glad/glad.h
+2
-8
No files found.
COPYRIGHT.txt
View file @
2bbcc521
...
...
@@ -170,7 +170,7 @@ License: FTL
Files: ./thirdparty/glad/
Comment: glad
Copyright: 2013-201
8
, David Herberth
Copyright: 2013-201
9
, David Herberth
License: Expat
Files: ./thirdparty/jpeg_compressor/
...
...
thirdparty/README.md
View file @
2bbcc521
...
...
@@ -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.
...
...
thirdparty/glad/KHR/khrplatform.h
View file @
2bbcc521
...
...
@@ -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
...
...
thirdparty/glad/glad.c
View file @
2bbcc521
/*
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
...
...
thirdparty/glad/glad/glad.h
View file @
2bbcc521
/*
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment