AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114 from syoyo/fix-exceptions-to-assertions-build

Browse Source 
Fix build when SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS=On.
This commit is contained in:
Hans-Kristian Arntzen 2017-02-03 07:40:33 +01:00 committed by GitHub
commit 4881d41b5c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spirv_cross.cpp
View File

@ -2404,7 +2404,7 @@ bool Compiler::interface_variable_exists_in_entry_point(uint32_t id) const
auto &var = get<SPIRVariable>(id); auto &var = get<SPIRVariable>(id);
if (var.storage != StorageClassInput && var.storage != StorageClassOutput && if (var.storage != StorageClassInput && var.storage != StorageClassOutput &&
var.storage != StorageClassUniformConstant) var.storage != StorageClassUniformConstant)
throw CompilerError( SPIRV_CROSS_THROW(
"Only Input, Output variables and Uniform constants are part of a shader linking interface."); "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 // This is to avoid potential problems with very old glslang versions which did

4
spirv_hlsl.cpp
View File

@ -632,7 +632,7 @@ void CompilerHLSL::emit_texture_op(const Instruction &i)
uint32_t length = i.length; uint32_t length = i.length;
if (i.offset + length > spirv.size()) 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 result_type = ops[0];
uint32_t id = ops[1]; uint32_t id = ops[1];
@ -999,7 +999,7 @@ string CompilerHLSL::compile()
do do
{ {
if (pass_count >= 3) 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(); reset();