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

Ensure that we use primary alias type when emitting flattened members.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2020-07-29 13:02:25 +02:00
parent aac6885950
commit eb580d6656
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spirv_glsl.cpp
View File

@ -2142,6 +2142,10 @@ void CompilerGLSL::emit_flattened_io_block_member(const std::string &basename, c
assert(member_type->basetype != SPIRType::Struct); assert(member_type->basetype != SPIRType::Struct);
// We're overriding struct member names, so ensure we do so on the primary type.
if (parent_type->type_alias)
parent_type = &get<SPIRType>(parent_type->type_alias);
// Sanitize underscores because joining the two identifiers might create more than 1 underscore in a row, // Sanitize underscores because joining the two identifiers might create more than 1 underscore in a row,
// which is not allowed. // which is not allowed.
flattened_name = sanitize_underscores(flattened_name); flattened_name = sanitize_underscores(flattened_name);
@ -2185,10 +2189,14 @@ void CompilerGLSL::emit_flattened_io_block_struct(const std::string &basename, c
void CompilerGLSL::emit_flattened_io_block(const SPIRVariable &var, const char *qual) void CompilerGLSL::emit_flattened_io_block(const SPIRVariable &var, const char *qual)
{ {
auto &type = get<SPIRType>(var.basetype); auto &var_type = get<SPIRType>(var.basetype);
if (!type.array.empty()) if (!var_type.array.empty())
SPIRV_CROSS_THROW("Array of varying structs cannot be flattened to legacy-compatible varyings."); SPIRV_CROSS_THROW("Array of varying structs cannot be flattened to legacy-compatible varyings.");
// Emit flattened types based on the type alias. Normally, we are never supposed to emit
// struct declarations for aliased types.
auto &type = var_type.type_alias ? get<SPIRType>(var_type.type_alias) : var_type;
auto old_flags = ir.meta[type.self].decoration.decoration_flags; auto old_flags = ir.meta[type.self].decoration.decoration_flags;
// Emit the members as if they are part of a block to get all qualifiers. // Emit the members as if they are part of a block to get all qualifiers.
ir.meta[type.self].decoration.decoration_flags.set(DecorationBlock); ir.meta[type.self].decoration.decoration_flags.set(DecorationBlock);