Have generate_interface return the generated statement

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 48fc742342bdf042aa32bdbd5686e61e1e43bbe0..951a672d89eb3d90bcc38aecdc3fd78b0febebbc 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -61,12 +61,12 @@ class VariableResolver: private TraversingVisitor
 {
 private:
        Stage *stage;
-       std::map<std::string, VariableDeclaration *> *members;
-       RefPtr<InterfaceBlockReference> iface_ref;
+       std::map<std::string, VariableDeclaration *> *r_members;
+       RefPtr<InterfaceBlockReference> r_iface_ref;
        std::string block_interface;
        bool record_target;
-       VariableDeclaration *assignment_target;
-       bool self_referencing;
+       bool r_self_referencing;
+       VariableDeclaration *r_assignment_target;
 
 public:
        VariableResolver();
@@ -78,8 +78,10 @@ private:
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
+       virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(FunctionCall &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
@@ -131,8 +133,8 @@ private:
        static std::string get_out_prefix(Stage::Type);
        std::string change_prefix(const std::string &, const std::string &) const;
        virtual void visit(Block &);
-       bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
-       bool generate_interface(InterfaceBlock &);
+       VariableDeclaration *generate_interface(VariableDeclaration &, const std::string &, const std::string &);
+       InterfaceBlock *generate_interface(InterfaceBlock &);
        ExpressionStatement &insert_assignment(const std::string &, Expression *);
        virtual void visit(VariableReference &);
        virtual void visit(VariableDeclaration &);