diff options
-rw-r--r-- | SPIRV/SpvTools.cpp | 12 | ||||
-rw-r--r-- | SPIRV/SpvTools.h | 7 | ||||
-rw-r--r-- | StandAlone/CMakeLists.txt | 6 | ||||
-rw-r--r-- | gtests/CMakeLists.txt | 6 |
4 files changed, 4 insertions, 27 deletions
diff --git a/SPIRV/SpvTools.cpp b/SPIRV/SpvTools.cpp index fce1fb9b..112ac33c 100644 --- a/SPIRV/SpvTools.cpp +++ b/SPIRV/SpvTools.cpp @@ -44,6 +44,7 @@ #include "SpvTools.h" #include "spirv-tools/optimizer.hpp" +#include "spirv-tools/libspirv.h" namespace glslang { @@ -113,18 +114,11 @@ void OptimizerMesssageConsumer(spv_message_level_t level, const char *source, out << std::endl; } -// Use the SPIRV-Tools disassembler to print SPIR-V using a SPV_ENV_UNIVERSAL_1_3 environment. +// Use the SPIRV-Tools disassembler to print SPIR-V. void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv) { - SpirvToolsDisassemble(out, spirv, SPV_ENV_UNIVERSAL_1_3); -} - -// Use the SPIRV-Tools disassembler to print SPIR-V with a provided SPIR-V environment. -void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv, - spv_target_env requested_context) -{ // disassemble - spv_context context = spvContextCreate(requested_context); + spv_context context = spvContextCreate(SPV_ENV_UNIVERSAL_1_3); spv_text text; spv_diagnostic diagnostic = nullptr; spvBinaryToText(context, spirv.data(), spirv.size(), diff --git a/SPIRV/SpvTools.h b/SPIRV/SpvTools.h index 691c9ef4..7779dfa7 100644 --- a/SPIRV/SpvTools.h +++ b/SPIRV/SpvTools.h @@ -44,7 +44,6 @@ #ifdef ENABLE_OPT #include <vector> #include <ostream> -#include "spirv-tools/libspirv.h" #endif #include "glslang/MachineIndependent/localintermediate.h" @@ -65,13 +64,9 @@ struct SpvOptions { #ifdef ENABLE_OPT -// Use the SPIRV-Tools disassembler to print SPIR-V using a SPV_ENV_UNIVERSAL_1_3 environment. +// Use the SPIRV-Tools disassembler to print SPIR-V. void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv); -// Use the SPIRV-Tools disassembler to print SPIR-V with a provided SPIR-V environment. -void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv, - spv_target_env requested_context); - // Apply the SPIRV-Tools validator to generated SPIR-V. void SpirvToolsValidate(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv, spv::SpvBuildLogger*, bool prelegalization); diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt index decfac5b..8038c043 100644 --- a/StandAlone/CMakeLists.txt +++ b/StandAlone/CMakeLists.txt @@ -70,12 +70,6 @@ target_include_directories(glslangValidator PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External>) -if(ENABLE_OPT) -target_include_directories(glslangValidator PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External/spirv-tools/include> - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External/spirv-tools/include>) -endif() - if(ENABLE_SPVREMAPPER) set(REMAPPER_SOURCES spirv-remap.cpp) add_executable(spirv-remap ${REMAPPER_SOURCES}) diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt index f489c9de..6c48d9c2 100644 --- a/gtests/CMakeLists.txt +++ b/gtests/CMakeLists.txt @@ -83,12 +83,6 @@ if(BUILD_TESTING) ${gmock_SOURCE_DIR}/include ${gtest_SOURCE_DIR}/include) - if(ENABLE_OPT) - target_include_directories(glslangtests PUBLIC - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../External/spirv-tools/include> - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/External/spirv-tools/include>) - endif() - set(LIBRARIES glslang OSDependent OGLCompiler glslang SPIRV glslang-default-resource-limits) |