From 29179f746a0d2db92b5fded6f5ec33ae6848a3c3 Mon Sep 17 00:00:00 2001 From: Syoyo Fujita Date: Fri, 3 Feb 2017 13:54:35 +0900 Subject: [PATCH] Fix build when SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=On. --- spirv_cross.cpp | 2 +- spirv_hlsl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spirv_cross.cpp b/spirv_cross.cpp index 64d80fd3..23b87fe6 100644 --- a/spirv_cross.cpp +++ b/spirv_cross.cpp @@ -2404,7 +2404,7 @@ bool Compiler::interface_variable_exists_in_entry_point(uint32_t id) const auto &var = get(id); if (var.storage != StorageClassInput && var.storage != StorageClassOutput && var.storage != StorageClassUniformConstant) - throw CompilerError( + SPIRV_CROSS_THROW( "Only Input, Output variables and Uniform constants are part of a shader linking interface."); // This is to avoid potential problems with very old glslang versions which did diff --git a/spirv_hlsl.cpp b/spirv_hlsl.cpp index c3dde0d1..079a3b82 100644 --- a/spirv_hlsl.cpp +++ b/spirv_hlsl.cpp @@ -632,7 +632,7 @@ void CompilerHLSL::emit_texture_op(const Instruction &i) uint32_t length = i.length; if (i.offset + length > spirv.size()) - throw CompilerError("Compiler::parse() opcode out of range."); + SPIRV_CROSS_THROW("Compiler::parse() opcode out of range."); uint32_t result_type = ops[0]; uint32_t id = ops[1]; @@ -999,7 +999,7 @@ string CompilerHLSL::compile() do { if (pass_count >= 3) - throw CompilerError("Over 3 compilation loops detected. Must be a bug!"); + SPIRV_CROSS_THROW("Over 3 compilation loops detected. Must be a bug!"); reset();