Follow type aliases in TypeResolver

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index f76c2c2d8fba55d7231f95dfd487d20e897b3061..b660a0957447f1507fb9aa1b0a8ed5e5dedf28f5 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -55,6 +55,27 @@ private:
        virtual void enter(Block &);
 };
 
+/** Resolves types of variables and base types of other types. */
+class TypeResolver: private TraversingVisitor
+{
+private:
+       Stage *stage;
+       std::map<TypeDeclaration *, TypeDeclaration *> alias_map;
+
+public:
+       TypeResolver();
+
+       void apply(Stage &);
+
+private:
+       TypeDeclaration *resolve_type(const std::string &);
+       virtual void visit(BasicTypeDeclaration &);
+       virtual void visit(ImageTypeDeclaration &);
+       virtual void visit(StructDeclaration &);
+       virtual void visit(VariableDeclaration &);
+       virtual void visit(FunctionDeclaration &);
+};
+
 /** Resolves variable references.  Variable references which match the name
 of an interface block are turned into interface block references. */
 class VariableResolver: private TraversingVisitor
@@ -65,8 +86,8 @@ private:
        RefPtr<InterfaceBlockReference> r_iface_ref;
        std::string block_interface;
        bool record_target;
-       VariableDeclaration *r_assignment_target;
        bool r_self_referencing;
+       VariableDeclaration *r_assignment_target;
 
 public:
        VariableResolver();
@@ -82,7 +103,6 @@ private:
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
        virtual void visit(FunctionCall &);
-       virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
 };
@@ -133,8 +153,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 &);