Fix a name conflict in certain inlining scenarios

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index eb7d488ae6071faa619f3e374c61084686e028b9..d828daa5172716cb6c173e129cd5c8d6126fb452 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: