Fix a name conflict in certain inlining scenarios

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

diff --git a/source/glsl/finalize.h b/source/glsl/finalize.h
index fd29737a713b3ed331e9ba4b0bddb2e13b9f72a6..f9502954f6b1d6ed9983e403c14414870ae63090 100644 (file)
--- a/source/glsl/finalize.h
+++ b/source/glsl/finalize.h
@@ -12,11 +12,9 @@ namespace SL {
 class StructOrganizer: private TraversingVisitor
 {
 private:
-       int offset;
+       int offset = -1;
 
 public:
-       StructOrganizer();
-
        void apply(Stage &s) { s.content.visit(*this); }
 
 private:
@@ -31,13 +29,13 @@ class LocationAllocator: private TraversingVisitor
 private:
        struct Uniform
        {
-               int location;
-               int desc_set;
-               int bind_point;
-
-               Uniform(): location(-1), desc_set(-1), bind_point(-1) { }
+               int location = -1;
+               int desc_set = 0;
+               int bind_point = -1;
        };
 
+       Features features;
+       bool alloc_new = true;
        std::map<std::string, std::set<unsigned> > used_locations;
        std::map<std::string, Uniform> uniforms;
        std::map<unsigned, std::set<unsigned> > used_bindings;
@@ -46,14 +44,14 @@ private:
        std::vector<InterfaceBlock *> unbound_blocks;
 
 public:
-       void apply(Module &, const Features &);
+       void apply(Module &, const Features &, bool = true);
 private:
        void apply(Stage &);
 
        void allocate_locations(const std::string &);
        void bind_uniform(RefPtr<Layout> &, const std::string &, unsigned);
-       void add_layout_value(RefPtr<Layout> &, const std::string &, unsigned);
 
+       bool visit_uniform(const std::string &, RefPtr<Layout> &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &) { }
@@ -64,14 +62,12 @@ according to the requirements of the target API. */
 class PrecisionConverter: private TraversingVisitor
 {
 private:
-       Stage *stage;
+       Stage *stage = 0;
        std::set<std::string> have_default;
        NodeList<Statement>::iterator insert_point;
        std::set<Node *> nodes_to_remove;
 
 public:
-       PrecisionConverter();
-
        void apply(Stage &);
 
 private:
@@ -80,34 +76,66 @@ private:
        virtual void visit(VariableDeclaration &);
 };
 
+/** Base class for feature converters. */
+class FeatureConverter: protected TraversingVisitor
+{
+protected:
+       Stage *stage = 0;
+       Features features;
+
+       FeatureConverter() = default;
+
+public:
+       void apply(Stage &, const Features &);
+protected:
+       virtual void apply() = 0;
+
+       void unsupported(const std::string &);
+
+       bool check_version(const Version &) const;
+       bool check_extension(bool Features::*) const;
+};
+
 /** Converts structures of the syntax tree to match a particular set of
 features. */
-class LegacyConverter: private TraversingVisitor
+class StructuralFeatureConverter: public FeatureConverter
 {
 private:
-       Stage *stage;
-       Features features;
-       VariableDeclaration *frag_out;
+       VariableDeclaration *frag_out = 0;
        NodeList<Statement>::iterator uniform_insert_point;
        std::set<Node *> nodes_to_remove;
+       RefPtr<Expression> r_replaced_reference;
+       bool r_flattened_interface = false;
 
 public:
-       LegacyConverter();
-
-       virtual void apply(Stage &, const Features &);
-
+       void apply(Stage &s, const Features &f) { FeatureConverter::apply(s, f); }
 private:
-       void unsupported(const std::string &);
+       virtual void apply();
 
        virtual void visit(Block &);
-       bool check_version(const Version &) const;
-       bool check_extension(bool Features::*) const;
+       virtual void visit(RefPtr<Expression> &);
        bool supports_stage(Stage::Type) const;
        bool supports_unified_interface_syntax() const;
        virtual void visit(VariableReference &);
+       virtual void visit(InterfaceBlockReference &);
+       virtual void visit(MemberAccess &);
        virtual void visit(Assignment &);
        bool supports_unified_sampling_functions() const;
        virtual void visit(FunctionCall &);
+       virtual void visit(VariableDeclaration &);
+       bool supports_interface_blocks(const std::string &) const;
+       virtual void visit(InterfaceBlock &);
+};
+
+/** Converts qualifiers on variables and blocksto match a particular set of
+features. */
+class QualifierConverter: private FeatureConverter
+{
+public:
+       void apply(Stage &s, const Features &f) { FeatureConverter::apply(s, f); }
+private:
+       virtual void apply();
+
        bool supports_interface_layouts() const;
        bool supports_stage_interface_layouts() const;
        bool supports_centroid_sampling() const;
@@ -115,7 +143,6 @@ private:
        bool supports_uniform_location() const;
        bool supports_binding() const;
        virtual void visit(VariableDeclaration &);
-       bool supports_interface_blocks(const std::string &) const;
        bool supports_interface_block_location() const;
        virtual void visit(InterfaceBlock &);
 };