Skip remapped vars in 'fixup_reserved_names'

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);
 }