From 2eff11b040077b3e7c647a519d4f313871a92674 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Tue, 10 May 2022 19:44:43 -0400 Subject: 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. --- source/slang/slang-emit-spirv.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source') 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. -- cgit v1.2.3