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 4968297635c074e975af19e42934c57fe1da78a7..aba2c353f827239f7f4aaf3b2d2d73560d680db2 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,134 +11,96 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DeclarationCombiner: private TraversingVisitor
+/** Assigns IDs to specialization constants with an automatic ID. */
+class ConstantIdAssigner: private TraversingVisitor
 {
 private:
-       std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-       std::map<std::string, VariableDeclaration *> variables;
-       std::set<Node *> nodes_to_remove;
+       std::set<unsigned> used_ids;
+       std::map<std::string, unsigned> existing_constants;
+       std::vector<VariableDeclaration *> auto_constants;
 
 public:
-       void apply(Stage &);
+       void apply(Module &, const Features &);
 
 private:
-       virtual void visit(Block &);
-       virtual void visit(FunctionDeclaration &);
        virtual void visit(VariableDeclaration &);
 };
 
-class BlockResolver: private TraversingVisitor
-{
-public:
-       void apply(Stage &s) { s.content.visit(*this); }
-
-private:
-       virtual void enter(Block &);
-       virtual void visit(InterfaceBlock &);
-};
-
-class VariableResolver: private TraversingVisitor
-{
-private:
-       Block *builtins;
-       std::map<std::string, VariableDeclaration *> *members;
-       RefPtr<InterfaceBlockReference> iface_ref;
-       std::string block_interface;
-       bool record_target;
-       VariableDeclaration *assignment_target;
-       bool self_referencing;
-
-public:
-       VariableResolver();
-
-       void apply(Stage &);
+/** Materializes implicitly declared interfaces.
 
-private:
-       Block *next_block(Block &);
+Out variable declarations inside functions are moved to the global scope.
 
-       virtual void enter(Block &);
-       virtual void visit(VariableReference &);
-       virtual void visit(InterfaceBlockReference &);
-       virtual void visit(MemberAccess &);
-       virtual void visit(BinaryExpression &);
-       virtual void visit(Assignment &);
-       virtual void visit(StructDeclaration &);
-       virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
-};
-
-class FunctionResolver: private TraversingVisitor
-{
-private:
-       std::map<std::string, std::vector<FunctionDeclaration *> > functions;
-
-public:
-       void apply(Stage &s) { s.content.visit(*this); }
-
-private:
-       virtual void visit(FunctionCall &);
-       virtual void visit(FunctionDeclaration &);
-};
+Passthrough statements are processed, generating out variables to match in
+variables and copying values.
 
+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;
-       InterfaceBlock *iface_block;
+       bool function_scope = false;
+       bool copy_block = false;
+       std::vector<VariableDeclaration *> declared_inputs;
+       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:
        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 &);
+       VariableDeclaration *generate_interface(VariableDeclaration &, const std::string &, const std::string &);
        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 DeclarationReorderer: private TraversingVisitor
+class LayoutDefaulter: private TraversingVisitor
 {
 private:
-       enum DeclarationKind
-       {
-               NO_DECLARATION,
-               LAYOUT,
-               STRUCT,
-               VARIABLE,
-               FUNCTION
-       };
-
-       DeclarationKind kind;
-       std::set<Node *> ordered_funcs;
-       std::set<Node *> needed_funcs;
+       InterfaceLayout *in_iface = 0;
+       bool need_winding = true;
+       bool need_spacing = true;
 
 public:
-       DeclarationReorderer();
+       void apply(Stage &);
 
-       void apply(Stage &s) { s.content.visit(*this); }
+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:
-       virtual void visit(Block &);
+       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 &) { kind = LAYOUT; }
-       virtual void visit(StructDeclaration &) { kind = STRUCT; }
+       virtual void visit(InterfaceLayout &);
        virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
-       virtual void visit(FunctionDeclaration &);
 };
 
 } // namespace SL