Resolve and validate the parameters of constructors in GLSL

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index ddf2b5f629cb0a8aadedd76dd0eab5041dfe1fa4..58bc4ca202e6bdbf60f5d625c1f5b5ba2004ef14 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,23 +11,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** Combines multiple declarations of the same identifier into one. */
-class DeclarationCombiner: private TraversingVisitor
-{
-private:
-       std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-       std::map<std::string, VariableDeclaration *> variables;
-       std::set<Node *> nodes_to_remove;
-
-public:
-       void apply(Stage &);
-
-private:
-       virtual void visit(Block &);
-       virtual void visit(VariableDeclaration &);
-       virtual void visit(FunctionDeclaration &) { }
-};
-
 /** Manipulates specialization constants.  If values are specified, turns
 specialization constants into normal constants.  Without values assigns
 automatic constant_ids to specialization constants. */
@@ -48,8 +31,13 @@ private:
 /** Forms links between nested blocks in the syntax tree. */
 class BlockHierarchyResolver: private TraversingVisitor
 {
+private:
+       bool r_any_resolved;
+
 public:
-       void apply(Stage &s) { s.content.visit(*this); }
+       BlockHierarchyResolver(): r_any_resolved(false) { }
+
+       bool apply(Stage &s) { r_any_resolved = false; s.content.visit(*this); return r_any_resolved; }
 
 private:
        virtual void enter(Block &);
@@ -63,19 +51,23 @@ 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:
        TypeResolver();
 
-       void apply(Stage &);
+       bool apply(Stage &);
 
 private:
-       TypeDeclaration *resolve_type(const std::string &);
+       TypeDeclaration *get_or_create_array_type(TypeDeclaration &);
+       void resolve_type(TypeDeclaration *&, const std::string &, bool);
        virtual void visit(Block &);
        virtual void visit(BasicTypeDeclaration &);
        virtual void visit(ImageTypeDeclaration &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
+       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
 };
 
@@ -85,27 +77,31 @@ class VariableResolver: private TraversingVisitor
 {
 private:
        Stage *stage;
-       std::map<std::string, VariableDeclaration *> *r_members;
-       RefPtr<InterfaceBlockReference> r_iface_ref;
-       std::string block_interface;
+       RefPtr<Expression> r_replacement_expr;
+       bool r_any_resolved;
        bool record_target;
        bool r_self_referencing;
-       VariableDeclaration *r_assignment_target;
+       Assignment::Target r_assignment_target;
+       std::vector<VariableDeclaration *> redeclared_builtins;
+       std::set<Node *> nodes_to_remove;
 
 public:
        VariableResolver();
 
-       void apply(Stage &);
+       bool apply(Stage &);
 
 private:
        virtual void enter(Block &);
+       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 &);
+       void merge_layouts(Layout &, const Layout &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
 };
@@ -122,11 +118,21 @@ private:
                SAME_TYPE
        };
 
+       struct ArgumentInfo
+       {
+               BasicTypeDeclaration *type;
+               unsigned component_count;
+       };
+
        Stage *stage;
        std::vector<BasicTypeDeclaration *> basic_types;
+       NodeList<Statement>::iterator insert_point;
+       bool r_any_resolved;
 
 public:
-       void apply(Stage &s) { stage = &s; s.content.visit(*this); }
+       ExpressionResolver();
+
+       bool apply(Stage &);
 
 private:
        static bool is_scalar(BasicTypeDeclaration &);
@@ -138,15 +144,21 @@ private:
        BasicTypeDeclaration *find_type(BasicTypeDeclaration &, BasicTypeDeclaration::Kind, unsigned);
        void convert_to(RefPtr<Expression> &, BasicTypeDeclaration &);
        bool convert_to_element(RefPtr<Expression> &, BasicTypeDeclaration &);
+       bool truncate_vector(RefPtr<Expression> &, unsigned);
+       void resolve(Expression &, TypeDeclaration *, bool);
 
+       virtual void visit(Block &);
        virtual void visit(Literal &);
-       virtual void visit(ParenthesizedExpression &);
        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 &);
+       void visit_constructor(FunctionCall &);
        virtual void visit(FunctionCall &);
        virtual void visit(BasicTypeDeclaration &);
        virtual void visit(VariableDeclaration &);
@@ -158,9 +170,10 @@ class FunctionResolver: private TraversingVisitor
 private:
        Stage *stage;
        std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
+       bool r_any_resolved;
 
 public:
-       void apply(Stage &);
+       bool apply(Stage &);
 
 private:
        virtual void visit(FunctionCall &);
@@ -182,8 +195,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;