X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.cpp;h=e03e64cd288708c8e476a56a9e921a3f5cbd3b59;hp=e102349a6482f0dc4a679ee325561210948dd52b;hb=6fe1876a3040cc78ba4713194abf6d121f419458;hpb=75db32b9aa62dba642391fb072068f6032c22472

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index e102349a..e03e64cd 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -205,7 +205,6 @@ void ProgramCompiler::generate(Stage &stage)
 	apply<VariableResolver>(stage);
 	apply<InterfaceGenerator>(stage);
 	apply<VariableResolver>(stage);
-	apply<VariableRenamer>(stage);
 	apply<DeclarationReorderer>(stage);
 	apply<LegacyConverter>(stage);
 }
@@ -876,7 +875,10 @@ void ProgramCompiler::InterfaceGenerator::visit(VariableReference &var)
 	if(i==prev_out.end())
 		i = prev_out.find(in_prefix+var.name);
 	if(i!=prev_out.end())
-		generate_interface(*i->second, "in", var.name);
+	{
+		generate_interface(*i->second, "in", i->second->name);
+		var.name = i->second->name;
+	}
 }
 
 void ProgramCompiler::InterfaceGenerator::visit(VariableDeclaration &var)
@@ -978,20 +980,6 @@ void ProgramCompiler::InterfaceGenerator::visit(Passthrough &pass)
 }
 
 
-void ProgramCompiler::VariableRenamer::visit(VariableReference &var)
-{
-	if(var.declaration)
-		var.name = var.declaration->name;
-}
-
-void ProgramCompiler::VariableRenamer::visit(VariableDeclaration &var)
-{
-	if(var.linked_declaration)
-		var.name = var.linked_declaration->name;
-	TraversingVisitor::visit(var);
-}
-
-
 ProgramCompiler::DeclarationReorderer::DeclarationReorderer():
 	kind(NO_DECLARATION)
 { }