Implement the ternary operator in GLSL

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index a728e99ced3a8bccd24aaa89de94cbbddee09664..0a940cea5599a8f1381aadf6b9051989ac607a29 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -68,6 +68,7 @@ private:
        std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
        std::map<TypeDeclaration *, TypeDeclaration *> array_types;
        NodeList<Statement>::iterator type_insert_point;
+       InterfaceBlock *iface_block;
        bool r_any_resolved;
 
 public:
@@ -83,6 +84,7 @@ private:
        virtual void visit(ImageTypeDeclaration &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
 };
 
@@ -93,11 +95,10 @@ class VariableResolver: private TraversingVisitor
 private:
        Stage *stage;
        RefPtr<Expression> r_replacement_expr;
-       std::string block_interface;
        bool r_any_resolved;
        bool record_target;
        bool r_self_referencing;
-       VariableDeclaration *r_assignment_target;
+       Assignment::Target r_assignment_target;
 
 public:
        VariableResolver();
@@ -106,14 +107,15 @@ public:
 
 private:
        virtual void enter(Block &);
-       void visit_and_replace(RefPtr<Expression> &);
+       virtual void visit(RefPtr<Expression> &);
+       void check_assignment_target(Statement *);
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
+       void add_to_chain(Assignment::Target::ChainType, unsigned);
        virtual void visit(MemberAccess &);
-       virtual void visit(UnaryExpression &);
+       virtual void visit(Swizzle &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
-       virtual void visit(FunctionCall &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
 };
@@ -156,10 +158,12 @@ private:
        virtual void visit(VariableReference &);
        virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
+       virtual void visit(Swizzle &);
        virtual void visit(UnaryExpression &);
        void visit(BinaryExpression &, bool);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(TernaryExpression &);
        virtual void visit(FunctionCall &);
        virtual void visit(BasicTypeDeclaration &);
        virtual void visit(VariableDeclaration &);
@@ -196,8 +200,8 @@ private:
        std::string in_prefix;
        std::string out_prefix;
        bool function_scope;
-       InterfaceBlock *iface_block;
        bool copy_block;
+       std::vector<VariableDeclaration *> declared_inputs;
        Block *iface_target_block;
        NodeList<Statement>::iterator iface_insert_point;
        NodeList<Statement>::iterator assignment_insert_point;