diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang-glslang/slang-glslang.cpp | 5 | ||||
| -rw-r--r-- | source/slang/hlsl.meta.slang | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/source/slang-glslang/slang-glslang.cpp b/source/slang-glslang/slang-glslang.cpp index 6bfd112a7..4abcada62 100644 --- a/source/slang-glslang/slang-glslang.cpp +++ b/source/slang-glslang/slang-glslang.cpp @@ -2,8 +2,7 @@ #include "slang-glslang.h" #include "SPIRV/GlslangToSpv.h" -#include "SPIRV/disassemble.h" -#include "glslang/Public/ResourceLimits.h" +#include "glslang/MachineIndependent/localintermediate.h" #include "glslang/Public/ShaderLang.h" #include "slang.h" #include "spirv-tools/libspirv.h" @@ -13,6 +12,8 @@ #include <windows.h> #endif +#include <cassert> +#include <iostream> #include <memory> #include <mutex> #include <sstream> diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang index 35b88f9dc..194c14b19 100644 --- a/source/slang/hlsl.meta.slang +++ b/source/slang/hlsl.meta.slang @@ -19785,7 +19785,6 @@ ${ } [__NoSideEffect] - [ForceInline] __glsl_version(450) __glsl_extension(GL_NV_shader_texture_footprint) [require(glsl_spirv, texturefootprint)] @@ -19813,7 +19812,6 @@ ${ } [__NoSideEffect] - [ForceInline] __glsl_version(450) __glsl_extension(GL_NV_shader_texture_footprint) [require(glsl_spirv, texturefootprint)] @@ -19842,7 +19840,6 @@ ${ } [__NoSideEffect] - [ForceInline] __glsl_version(450) __glsl_extension(GL_NV_shader_texture_footprint) __glsl_extension(GL_ARB_sparse_texture_clamp) @@ -19873,7 +19870,6 @@ ${ } [__NoSideEffect] - [ForceInline] __glsl_version(450) __glsl_extension(GL_NV_shader_texture_footprint) __glsl_extension(GL_ARB_sparse_texture_clamp) @@ -19905,7 +19901,6 @@ ${ } [__NoSideEffect] - [ForceInline] __glsl_version(450) __glsl_extension(GL_NV_shader_texture_footprint) [__requiresNVAPI] @@ -19939,7 +19934,6 @@ ${{{ // Texture sampling with gradient is only available for 2D textures. }}} [__NoSideEffect] - [ForceInline] __glsl_version(450) __glsl_extension(GL_NV_shader_texture_footprint) [__requiresNVAPI] @@ -19970,7 +19964,6 @@ ${{{ } [__NoSideEffect] - [ForceInline] __glsl_version(450) __glsl_extension(GL_NV_shader_texture_footprint) __glsl_extension(GL_ARB_sparse_texture_clamp) |