diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-09 10:13:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 10:13:27 +0100 |
| commit | 18dae8409c04b07a5817eb8c1ad612283bc40ac5 (patch) | |
| tree | 2ffb251ec8da506b083440b711eb2dcffb329f1d /thirdparty/glslang/SPIRV/SpvTools.h | |
| parent | 6b3798ecb3a27535ed965f3604f5481a6515b455 (diff) | |
| parent | 1231c2ecfc70e6efb3fbbdc77c87598a7b767114 (diff) | |
Merge pull request #36932 from akien-mga/vulkan-sdk-1.2.131.2
Update Vulkan SDK to 1.2.131.2 and matching glslang version
Diffstat (limited to 'thirdparty/glslang/SPIRV/SpvTools.h')
| -rw-r--r-- | thirdparty/glslang/SPIRV/SpvTools.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/thirdparty/glslang/SPIRV/SpvTools.h b/thirdparty/glslang/SPIRV/SpvTools.h index 7e49ae0b30..59c914da0b 100644 --- a/thirdparty/glslang/SPIRV/SpvTools.h +++ b/thirdparty/glslang/SPIRV/SpvTools.h @@ -41,10 +41,12 @@ #ifndef GLSLANG_SPV_TOOLS_H #define GLSLANG_SPV_TOOLS_H +#ifdef ENABLE_OPT #include <vector> #include <ostream> +#endif -#include "../glslang/MachineIndependent/localintermediate.h" +#include "glslang/MachineIndependent/localintermediate.h" #include "Logger.h" namespace glslang { @@ -59,14 +61,14 @@ struct SpvOptions { bool validate; }; -#if ENABLE_OPT +#ifdef ENABLE_OPT // Use the SPIRV-Tools disassembler to print SPIR-V. void SpirvToolsDisassemble(std::ostream& out, const std::vector<unsigned int>& spirv); // Apply the SPIRV-Tools validator to generated SPIR-V. void SpirvToolsValidate(const glslang::TIntermediate& intermediate, std::vector<unsigned int>& spirv, - spv::SpvBuildLogger*); + spv::SpvBuildLogger*, bool prelegalization); // Apply the SPIRV-Tools optimizer to generated SPIR-V, for the purpose of // legalizing HLSL SPIR-V. |