Use default member initializers for simple types

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 2cf5c54a3735a611070f1314762a165de7a24b6d..fc58b2db16134108cf4e7fa653d6c1a6258b9ce3 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,97 +11,20 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** Combines multiple declarations of the same identifier into one. */
-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;
-
-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. */
-class ConstantSpecializer: private TraversingVisitor
-{
-private:
-       const std::map<std::string, int> *values;
+       std::set<unsigned> used_ids;
+       std::vector<VariableDeclaration *> auto_constants;
 
 public:
-       ConstantSpecializer();
-
-       void apply(Stage &, const std::map<std::string, int> *);
+       void apply(Module &, const Features &);
 
 private:
        virtual void visit(VariableDeclaration &);
 };
 
-/** Forms links between nested blocks in the syntax tree. */
-class BlockHierarchyResolver: private TraversingVisitor
-{
-public:
-       void apply(Stage &s) { s.content.visit(*this); }
-
-private:
-       virtual void enter(Block &);
-};
-
-/** Resolves variable references.  Variable references which match the name
-of an interface block are turned into interface block references. */
-class VariableResolver: private TraversingVisitor
-{
-private:
-       Stage *stage;
-       std::map<std::string, VariableDeclaration *> *r_members;
-       RefPtr<InterfaceBlockReference> r_iface_ref;
-       std::string block_interface;
-       bool record_target;
-       bool r_self_referencing;
-       VariableDeclaration *r_assignment_target;
-
-public:
-       VariableResolver();
-
-       void apply(Stage &);
-
-private:
-       virtual void enter(Block &);
-       virtual void visit(VariableReference &);
-       virtual void visit(InterfaceBlockReference &);
-       virtual void visit(MemberAccess &);
-       virtual void visit(UnaryExpression &);
-       virtual void visit(BinaryExpression &);
-       virtual void visit(Assignment &);
-       virtual void visit(FunctionCall &);
-       virtual void visit(StructDeclaration &);
-       virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
-};
-
-/** Resolves function declarations and calls. */
-class FunctionResolver: private TraversingVisitor
-{
-private:
-       Stage *stage;
-       std::map<std::string, std::vector<FunctionDeclaration *> > declarations;
-
-public:
-       void apply(Stage &);
-
-private:
-       virtual void visit(FunctionCall &);
-       virtual void visit(FunctionDeclaration &);
-};
-
 /** Materializes implicitly declared interfaces.
 
 Out variable declarations inside functions are moved to the global scope.
@@ -113,28 +36,26 @@ 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 copy_block;
-       Block *iface_target_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 &);
-       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 &);