Unify handling of variables and interface blocks in the GLSL compiler

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index ef8ca10e35b198b5da4a38abc09708b08455f267..73b933bfb63b0f04155c80ab2bb7e484f2529f03 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,18 +11,16 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-/** 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
+/** Assigns IDs to specialization constants with an automatic ID. */
+class ConstantIdAssigner: private TraversingVisitor
 {
 private:
-       const std::map<std::string, int> *values;
+       std::set<unsigned> used_ids;
+       std::map<std::string, unsigned> existing_constants;
+       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 &);
@@ -39,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:
@@ -60,11 +56,9 @@ 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 &);
 };