diff options
author | Yuwen Wu <atyuwen@gmail.com> | 2022-08-24 06:06:09 +0300 |
---|---|---|
committer | Yuwen Wu <atyuwen@gmail.com> | 2022-08-24 06:06:09 +0300 |
commit | 10f2aa77da85ff2c7064702beffff9c1a2dccd0f (patch) | |
tree | 54604671362b218e5ab258e96c02da1381ddcff3 | |
parent | 9afa82e7b8ebf29eff349c7d931e18c66bdcc2c9 (diff) |
Skip remapped vars in 'fixup_reserved_names'
-rw-r--r-- | spirv_cross_parsed_ir.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spirv_cross_parsed_ir.cpp b/spirv_cross_parsed_ir.cpp index 33e672dc..3b4d6e5c 100644 --- a/spirv_cross_parsed_ir.cpp +++ b/spirv_cross_parsed_ir.cpp @@ -330,6 +330,10 @@ void ParsedIR::fixup_reserved_names() { for (uint32_t id : meta_needing_name_fixup) { + // Don't rename remapped variables like 'gl_LastFragDepthARM'. + if (ids[id].get_type() == TypeVariable && get<SPIRVariable>(id).remapped_variable) + continue; + auto &m = meta[id]; sanitize_identifier(m.decoration.alias, false, false); for (auto &memb : m.members) @@ -342,8 +346,6 @@ void ParsedIR::set_name(ID id, const string &name) { auto &m = meta[id]; m.decoration.alias = name; - if (ids[id].get_type() == TypeVariable && get<SPIRVariable>(id).remapped_variable) - return; if (!is_valid_identifier(name) || is_reserved_identifier(name, false, false)) meta_needing_name_fixup.insert(id); } |