diff options
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 |