Ignore function parameters in InterfaceGenerator

[libs/gl.git] / source / glsl / generate.h

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 511a460793d4e162fb05c24119c37c8538114322..f904021ad726fcf544f469c0787311bd056c9aea 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -25,18 +25,16 @@ private:
        virtual void visit(Block &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(VariableDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 class BlockResolver: private TraversingVisitor
 {
 public:
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
 private:
-       virtual void visit(Block &);
+       virtual void enter(Block &);
        virtual void visit(InterfaceBlock &);
-       using TraversingVisitor::visit;
 };
 
 class VariableResolver: private TraversingVisitor
@@ -57,7 +55,7 @@ public:
 private:
        Block *next_block(Block &);
 
-       virtual void visit(Block &);
+       virtual void enter(Block &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
        virtual void visit(BinaryExpression &);
@@ -65,9 +63,6 @@ private:
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
-       virtual void visit(FunctionDeclaration &);
-       virtual void visit(Iteration &);
-       using TraversingVisitor::visit;
 };
 
 class FunctionResolver: private TraversingVisitor
@@ -76,12 +71,11 @@ private:
        std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 
 public:
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
 private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 class InterfaceGenerator: private TraversingVisitor
@@ -107,8 +101,8 @@ private:
        ExpressionStatement &insert_assignment(const std::string &, Expression *);
        virtual void visit(VariableReference &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(FunctionDeclaration &);
        virtual void visit(Passthrough &);
-       using TraversingVisitor::visit;
 };
 
 class DeclarationReorderer: private TraversingVisitor
@@ -130,7 +124,7 @@ private:
 public:
        DeclarationReorderer();
 
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
 private:
        virtual void visit(Block &);
@@ -140,7 +134,6 @@ private:
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
        virtual void visit(FunctionDeclaration &);
-       using TraversingVisitor::visit;
 };
 
 } // namespace SL