diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2022-11-14 11:27:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 11:27:00 +0800 |
| commit | 623f5c36e0dc8190753aa5fa2e89f1010c367c67 (patch) | |
| tree | a21bdacd766b138316186877bc20c4001ed64451 /external/glslang-generated | |
| parent | 3e312b3062ab493c80d7d7eddf43c94ec59ecdb7 (diff) | |
glslang: 11.10.0-16-g42398c93 -> 11.12.0-32-gf74f37c5 (#2507)
Diffstat (limited to 'external/glslang-generated')
| -rw-r--r-- | external/glslang-generated/README.md | 9 | ||||
| -rw-r--r-- | external/glslang-generated/glslang/build_info.h | 26 |
2 files changed, 21 insertions, 14 deletions
diff --git a/external/glslang-generated/README.md b/external/glslang-generated/README.md index c49348c5a..d13ebd9b8 100644 --- a/external/glslang-generated/README.md +++ b/external/glslang-generated/README.md @@ -15,6 +15,13 @@ The following are not submodules files, and are produces elsewhere and placed in * external/spirv-tools-generated * external/glslang-generated +Updating glslang +---------------- + +*On Linux, you can run the [`external/bump-glslang.sh`](../bump-glslang.sh) script.* + +*On any platform, you can follow the below instructions:* + To get the latest version of one of the submodules you can use ``` @@ -55,4 +62,4 @@ Then just build Slang as usual in visual studio, or from the linux command line ``` % make config=release_x64 % make config=release_x86 -```
\ No newline at end of file +``` diff --git a/external/glslang-generated/glslang/build_info.h b/external/glslang-generated/glslang/build_info.h index e47b810c7..e711b2095 100644 --- a/external/glslang-generated/glslang/build_info.h +++ b/external/glslang-generated/glslang/build_info.h @@ -35,28 +35,28 @@ #define GLSLANG_BUILD_INFO #define GLSLANG_VERSION_MAJOR 11 -#define GLSLANG_VERSION_MINOR 10 +#define GLSLANG_VERSION_MINOR 12 #define GLSLANG_VERSION_PATCH 0 #define GLSLANG_VERSION_FLAVOR "" #define GLSLANG_VERSION_GREATER_THAN(major, minor, patch) \ - (((major) > GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \ - (((minor) > GLSLANG_VERSION_MINOR) || ((minor) == GLSLANG_VERSION_MINOR && \ - ((patch) > GLSLANG_VERSION_PATCH))))) + ((GLSLANG_VERSION_MAJOR) > (major) || ((major) == GLSLANG_VERSION_MAJOR && \ + ((GLSLANG_VERSION_MINOR) > (minor) || ((minor) == GLSLANG_VERSION_MINOR && \ + (GLSLANG_VERSION_PATCH) > (patch))))) #define GLSLANG_VERSION_GREATER_OR_EQUAL_TO(major, minor, patch) \ - (((major) > GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \ - (((minor) > GLSLANG_VERSION_MINOR) || ((minor) == GLSLANG_VERSION_MINOR && \ - ((patch) >= GLSLANG_VERSION_PATCH))))) + ((GLSLANG_VERSION_MAJOR) > (major) || ((major) == GLSLANG_VERSION_MAJOR && \ + ((GLSLANG_VERSION_MINOR) > (minor) || ((minor) == GLSLANG_VERSION_MINOR && \ + (GLSLANG_VERSION_PATCH >= (patch)))))) #define GLSLANG_VERSION_LESS_THAN(major, minor, patch) \ - (((major) < GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \ - (((minor) < GLSLANG_VERSION_MINOR) || ((minor) == GLSLANG_VERSION_MINOR && \ - ((patch) < GLSLANG_VERSION_PATCH))))) + ((GLSLANG_VERSION_MAJOR) < (major) || ((major) == GLSLANG_VERSION_MAJOR && \ + ((GLSLANG_VERSION_MINOR) < (minor) || ((minor) == GLSLANG_VERSION_MINOR && \ + (GLSLANG_VERSION_PATCH) < (patch))))) #define GLSLANG_VERSION_LESS_OR_EQUAL_TO(major, minor, patch) \ - (((major) < GLSLANG_VERSION_MAJOR) || ((major) == GLSLANG_VERSION_MAJOR && \ - (((minor) < GLSLANG_VERSION_MINOR) || ((minor) == GLSLANG_VERSION_MINOR && \ - ((patch) <= GLSLANG_VERSION_PATCH))))) + ((GLSLANG_VERSION_MAJOR) < (major) || ((major) == GLSLANG_VERSION_MAJOR && \ + ((GLSLANG_VERSION_MINOR) < (minor) || ((minor) == GLSLANG_VERSION_MINOR && \ + (GLSLANG_VERSION_PATCH <= (patch)))))) #endif // GLSLANG_BUILD_INFO |