Rename imported interface variables in InterfaceGenerator

[libs/gl.git] / source / programcompiler.cpp

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index e102349a6482f0dc4a679ee325561210948dd52b..e03e64cd288708c8e476a56a9e921a3f5cbd3b59 100644 (file)
--- 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)
 { }