diff options
Diffstat (limited to 'source/slang')
| -rw-r--r-- | source/slang/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/slang/slang-ir-glsl-legalize.cpp | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index fd20bbe22..78d2376a7 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -152,8 +152,12 @@ target_include_directories( # generated lookup tables # +if (NOT SLANG_USE_SYSTEM_SPIRV_HEADERS) + set(SLANG_SPIRV_HEADERS_INCLUDE_DIR "${slang_SOURCE_DIR}/external/spirv-headers/include") +endif() + set(SLANG_LOOKUP_GENERATOR_INPUT_JSON - "${slang_SOURCE_DIR}/external/spirv-headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json" + "${SLANG_SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/extinst.glsl.std.450.grammar.json" ) set(SLANG_LOOKUP_GENERATOR_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/slang-lookup-tables/" @@ -179,7 +183,7 @@ add_custom_command( ) set(SLANG_SPIRV_CORE_SOURCE_JSON - "${slang_SOURCE_DIR}/external/spirv-headers/include/spirv/unified1/spirv.core.grammar.json" + "${SLANG_SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.core.grammar.json" ) set(SLANG_SPIRV_CORE_GRAMMAR_SOURCE "${SLANG_LOOKUP_GENERATOR_OUTPUT_DIR}/slang-spirv-core-grammar-embed.cpp" diff --git a/source/slang/slang-ir-glsl-legalize.cpp b/source/slang/slang-ir-glsl-legalize.cpp index 2d7e0c804..4f19d45a2 100644 --- a/source/slang/slang-ir-glsl-legalize.cpp +++ b/source/slang/slang-ir-glsl-legalize.cpp @@ -11,7 +11,12 @@ #include "slang-ir-clone.h" #include "slang-ir-single-return.h" #include "slang-glsl-extension-tracker.h" + +#ifdef SLANG_USE_SYSTEM_SPIRV_HEADER +#include <spirv/unified1/spirv.h> +#else #include "../../external/spirv-headers/include/spirv/unified1/spirv.h" +#endif namespace Slang { |