diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2021-01-20 09:23:39 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 09:23:39 -0800 |
| commit | 660cf7a639cb0f73e2ea7abc4a4a8ca59e50c88d (patch) | |
| tree | f9d01c26370918814edb8e8e58b97699ec7b22ed /source | |
| parent | c6fd4a5b35911f0f056f6e924a2dbc86e328cc46 (diff) | |
Update glslang to 11.1.0 (#1662)
* Update glslang to 11.1.0
This change pulls new versions of glslang, spirv-headers, and spirv-tools as submodules, and makes the necessary changes to other files in the repository to get it all building (at least on Windows).
This change also enables building of glslang from source by default, so that we can easily generate new binaries for inclusion in the `slang-binaries` repository.
* fixup: missing file
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang-glslang/slang-glslang.cpp | 3 | ||||
| -rw-r--r-- | source/slang/hlsl.meta.slang | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/slang-glslang/slang-glslang.cpp b/source/slang-glslang/slang-glslang.cpp index 03bc0a17d..868d5adf3 100644 --- a/source/slang-glslang/slang-glslang.cpp +++ b/source/slang-glslang/slang-glslang.cpp @@ -5,7 +5,6 @@ #include "StandAlone/ResourceLimits.h" #include "StandAlone/Worklist.h" #include "glslang/Include/ShHandle.h" -#include "glslang/Include/revision.h" #include "glslang/Public/ShaderLang.h" #include "SPIRV/GlslangToSpv.h" #include "SPIRV/GLSL.std.450.h" @@ -589,6 +588,7 @@ int glslang_compile(glslang_CompileRequest_1_0* inRequest) return glslang_compile_1_1(&request); } +#if 0 static std::mutex g_globalMutex; namespace glslang { @@ -609,3 +609,4 @@ void ReleaseGlobalLock() } } // namespace glslang +#endif diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang index 851af7d3f..a9280d9ad 100644 --- a/source/slang/hlsl.meta.slang +++ b/source/slang/hlsl.meta.slang @@ -4283,13 +4283,13 @@ bool ReportHit(float tHit, uint hitKind, A attributes) // 10.3.4 __target_intrinsic(hlsl) __target_intrinsic(GL_NV_ray_tracing, ignoreIntersectionNV) -__target_intrinsic(GL_EXT_ray_tracing, ignoreIntersectionEXT) +__target_intrinsic(GL_EXT_ray_tracing, "ignoreIntersectionEXT;") void IgnoreHit(); // 10.3.5 __target_intrinsic(hlsl) __target_intrinsic(GL_NV_ray_tracing, terminateRayNV) -__target_intrinsic(GL_EXT_ray_tracing, terminateRayEXT) +__target_intrinsic(GL_EXT_ray_tracing, "terminateRayEXT;") void AcceptHitAndEndSearch(); // 10.4 - System Values and Special Semantics |