Check the flat qualifier from the correct member

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index eb7d488ae6071faa619f3e374c61084686e028b9..aba2c353f827239f7f4aaf3b2d2d73560d680db2 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -16,6 +16,7 @@ class ConstantIdAssigner: private TraversingVisitor
 {
 private:
        std::set<unsigned> used_ids;
+       std::map<std::string, unsigned> existing_constants;
        std::vector<VariableDeclaration *> auto_constants;
 
 public:
@@ -36,20 +37,18 @@ Unresolved variables are looked up in the previous stage's out variables. */
 class InterfaceGenerator: private TraversingVisitor
 {
 private:
-       Stage *stage;
+       Stage *stage = 0;
        std::string in_prefix;
        std::string out_prefix;
-       bool function_scope;
-       bool copy_block;
+       bool function_scope = false;
+       bool copy_block = false;
        std::vector<VariableDeclaration *> declared_inputs;
-       Block *iface_target_block;
+       Block *iface_target_block = 0;
        NodeList<Statement>::iterator iface_insert_point;
        NodeList<Statement>::iterator assignment_insert_point;
        std::set<Node *> nodes_to_remove;
 
 public:
-       InterfaceGenerator();
-
        void apply(Stage &);
 
 private:
@@ -57,15 +56,53 @@ private:
        std::string change_prefix(const std::string &, const std::string &) const;
        virtual void visit(Block &);
        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 &);
-       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(Passthrough &);
 };
 
+class LayoutDefaulter: private TraversingVisitor
+{
+private:
+       InterfaceLayout *in_iface = 0;
+       bool need_winding = true;
+       bool need_spacing = true;
+
+public:
+       void apply(Stage &);
+
+private:
+       virtual void visit(InterfaceLayout &);
+};
+
+/**
+Assigns sizes to arrays which don't have a size.  Geometry shader inputs are
+sized by topology.  Other arrays are sized by their use with literal indices.
+*/
+class ArraySizer: private TraversingVisitor
+{
+private:
+       std::map<VariableDeclaration *, int> max_indices;
+       unsigned input_size = 0;
+       VariableDeclaration *r_declaration;
+
+public:
+       void apply(Stage &);
+
+private:
+       virtual void visit(VariableReference &);
+       virtual void visit(MemberAccess &);
+       virtual void visit(Swizzle &);
+       virtual void visit(UnaryExpression&);
+       virtual void visit(BinaryExpression &);
+       virtual void visit(TernaryExpression &);
+       virtual void visit(FunctionCall &);
+       virtual void visit(InterfaceLayout &);
+       virtual void visit(VariableDeclaration &);
+};
+
 } // namespace SL
 } // namespace GL
 } // namespace Msp