diff options
| author | jsmall-nvidia <jsmall@nvidia.com> | 2022-05-10 19:44:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-10 16:44:43 -0700 |
| commit | 2eff11b040077b3e7c647a519d4f313871a92674 (patch) | |
| tree | 1fa86fcb83331432e888bdc04d2c5c09e104779b | |
| parent | 8a02d1302264f37394736f953d318b431f64005e (diff) | |
Glslang upgrade (#2228)
* #include an absolute path didn't work - because paths were taken to always be relative.
* Update SPIR-V headers/opt.
Update glslang.
* Set the SPIR-V emit version.
* Use the merged hash from shader-slang/glslang
* Improve comment around spirv version for emitting spir-v directly.
| m--------- | external/glslang | 0 | ||||
| -rw-r--r-- | external/glslang-generated/glslang/build_info.h | 2 | ||||
| m--------- | external/spirv-headers | 0 | ||||
| m--------- | external/spirv-tools | 0 | ||||
| -rw-r--r-- | external/spirv-tools-generated/build-version.inc | 2 | ||||
| -rw-r--r-- | source/slang/slang-emit-spirv.cpp | 9 |
6 files changed, 10 insertions, 3 deletions
diff --git a/external/glslang b/external/glslang -Subproject 418694e6cd2e2e84052f77bb8306d560c7d8fe3 +Subproject dc703d95289e5376de457af0ed9b3dd0f0f9756 diff --git a/external/glslang-generated/glslang/build_info.h b/external/glslang-generated/glslang/build_info.h index 661c4a3c1..32584835b 100644 --- a/external/glslang-generated/glslang/build_info.h +++ b/external/glslang-generated/glslang/build_info.h @@ -35,7 +35,7 @@ #define GLSLANG_BUILD_INFO #define GLSLANG_VERSION_MAJOR 11 -#define GLSLANG_VERSION_MINOR 6 +#define GLSLANG_VERSION_MINOR 9 #define GLSLANG_VERSION_PATCH 0 #define GLSLANG_VERSION_FLAVOR "" diff --git a/external/spirv-headers b/external/spirv-headers -Subproject 1380cbbec10756b492e9397d03c4250887e1509 +Subproject b765c355f488837ca4c77980ba69484f3ff277f diff --git a/external/spirv-tools b/external/spirv-tools -Subproject d997c83b103ed1f3af09ed65e1cbf89fbc6d945 +Subproject ffc8f2d45566329bb9e21170f9e2a34ed8a65e0 diff --git a/external/spirv-tools-generated/build-version.inc b/external/spirv-tools-generated/build-version.inc index d821a9829..016342c43 100644 --- a/external/spirv-tools-generated/build-version.inc +++ b/external/spirv-tools-generated/build-version.inc @@ -1 +1 @@ -"v2021.4-dev", "SPIRV-Tools v2021.4-dev v2021.3-62-gd997c83b" +"v2022.3-dev", "SPIRV-Tools v2022.3-dev v2022.1-79-gffc8f2d4" diff --git a/source/slang/slang-emit-spirv.cpp b/source/slang/slang-emit-spirv.cpp index a2211578d..6b3b42e92 100644 --- a/source/slang/slang-emit-spirv.cpp +++ b/source/slang/slang-emit-spirv.cpp @@ -349,7 +349,14 @@ struct SPIRVEmitContext // > Version nuumber // - m_words.add(SpvVersion); + + // TODO(JS): + // Was previously set to SpvVersion, but that doesn't work since we + // upgraded to SPIR-V headers 1.6. (It would lead to validation errors during vk tests) + // For now mark as version 1.5.0 + + static const uint32_t spvVersion1_5_0 = 0x00010500; + m_words.add(spvVersion1_5_0); // > Generator's magic number. // > Its value does not affect any semantics, and is allowed to be 0. |