Skip to content

Commit

Permalink
Merge pull request godotengine#77350 from akien-mga/glad-2.0.4
Browse files Browse the repository at this point in the history
glad: Re-generate files with glad 2.0.4
  • Loading branch information
akien-mga committed May 23, 2023
2 parents 86d3f43 + b137695 commit 56a15a5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
5 changes: 4 additions & 1 deletion thirdparty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ commits.
## glad

- Upstream: https://github.com/Dav1dde/glad
- Version: 2.0.2 (f237a2bfcec0d9b82b90ec9af4af265c40de7183, 2022)
- Version: 2.0.4 (d08b1aa01f8fe57498f04d47b5fa8c48725be877, 2023)
- License: CC0 1.0 and Apache 2.0

Files extracted from upstream source:
Expand All @@ -211,6 +211,9 @@ Files generated from [upstream web instance](https://gen.glad.sh/):
- `glx.c`
- `glad/glx.h`

See the permalinks in `glad/gl.h` and `glad/glx.h` to regenrate the files with
a new version of the web instance.


## glslang

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/glad/glad/gl.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Loader generated by glad 2.0.4 on Sat Apr 29 13:24:27 2023
* Loader generated by glad 2.0.4 on Mon May 22 13:18:29 2023
*
* SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0
*
Expand Down
5 changes: 3 additions & 2 deletions thirdparty/glad/glad/glx.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Loader generated by glad 2.0.2 on Tue Nov 15 09:49:49 2022
* Loader generated by glad 2.0.4 on Mon May 22 13:18:29 2023
*
* SPDX-License-Identifier: (WTFPL OR CC0-1.0) AND Apache-2.0
*
Expand Down Expand Up @@ -152,7 +152,7 @@ extern "C" {
#define GLAD_VERSION_MAJOR(version) (version / 10000)
#define GLAD_VERSION_MINOR(version) (version % 10000)

#define GLAD_GENERATOR_VERSION "2.0.2"
#define GLAD_GENERATOR_VERSION "2.0.4"

typedef void (*GLADapiproc)(void);

Expand Down Expand Up @@ -318,6 +318,7 @@ typedef unsigned __int64 uint64_t;




#if defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ > 1060)

#else
Expand Down

0 comments on commit 56a15a5

Please sign in to comment.