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

Merge pull request #144 from KhronosGroup/unknown-extension-fix

Browse Source 
Do not crash on unknown extensions.
This commit is contained in:
Hans-Kristian Arntzen 2017-03-21 16:50:12 +01:00 committed by GitHub
commit b03d789dd6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spirv_common.hpp
View File

@ -292,6 +292,7 @@ struct SPIRExtension : IVariant
enum Extension enum Extension
{ {
Unsupported,
GLSL GLSL
}; };

8
spirv_cross.cpp
View File

@ -1151,6 +1151,10 @@ void Compiler::parse(const Instruction &instruction)
break; break;
} }
case OpExtension:
// Ignore extensions
break;
case OpExtInstImport: case OpExtInstImport:
{ {
uint32_t id = ops[0]; uint32_t id = ops[0];
@ -1158,7 +1162,9 @@ void Compiler::parse(const Instruction &instruction)
if (ext == "GLSL.std.450") if (ext == "GLSL.std.450")
set<SPIRExtension>(id, SPIRExtension::GLSL); set<SPIRExtension>(id, SPIRExtension::GLSL);
else else
SPIRV_CROSS_THROW("Only GLSL.std.450 extension interface supported."); set<SPIRExtension>(id, SPIRExtension::Unsupported);
// Other SPIR-V extensions currently not supported.
break; break;
} }