Uniform(): location(-1), desc_set(-1), bind_point(-1) { }
};
+ 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;
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 &) { }
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 = 0;
- Features features;
VariableDeclaration *frag_out = 0;
NodeList<Statement>::iterator uniform_insert_point;
std::set<Node *> nodes_to_remove;
bool r_flattened_interface = false;
public:
- 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 &);
virtual void visit(RefPtr<Expression> &);
- bool check_version(const Version &) const;
- bool check_extension(bool Features::*) const;
bool supports_stage(Stage::Type) const;
bool supports_unified_interface_syntax() const;
virtual void visit(VariableReference &);
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;
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 &);
};