Rename members of visitors to indicate which are "return values"

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

diff --git a/source/glsl/compatibility.h b/source/glsl/compatibility.h
index f33768767b0b0909614e9c8181cf26a32cf66487..c30dce8c2f3c7728188a6dcc1e7c671c08a405d5 100644 (file)
--- a/source/glsl/compatibility.h
+++ b/source/glsl/compatibility.h
@@ -8,45 +8,63 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DefaultPrecisionGenerator: public BlockModifier
+/** Generates default precision declarations if they are missing, to satisfy
+GLSL ES requirements. */
+class DefaultPrecisionGenerator: private TraversingVisitor
 {
 private:
-       bool toplevel;
+       Stage *stage;
        std::set<std::string> have_default;
+       NodeList<Statement>::iterator insert_point;
 
 public:
        DefaultPrecisionGenerator();
 
-       using StageVisitor::visit;
+       void apply(Stage &);
+
+private:
        virtual void visit(Block &);
        virtual void visit(Precision &);
        virtual void visit(VariableDeclaration &);
 };
 
-class PrecisionRemover: public BlockModifier
+/** Removes precision qualifiers from variable declarations, as well as
+default precision declarations. */
+class PrecisionRemover: private TraversingVisitor
 {
+private:
+       std::set<Node *> nodes_to_remove;
+
 public:
-       using StageVisitor::visit;
+       void apply(Stage &);
+
+private:
        virtual void visit(Precision &);
        virtual void visit(VariableDeclaration &);
 };
 
-class LegacyConverter: public BlockModifier
+/** Converts structures of the syntax tree to match a particular set of
+features. */
+class LegacyConverter: private TraversingVisitor
 {
 private:
-       GLApi target_api;
-       Version target_version;
-       std::string type;
+       Stage *stage;
+       Features features;
+       std::string r_type;
        VariableDeclaration *frag_out;
+       NodeList<Statement>::iterator uniform_insert_point;
+       std::set<Node *> nodes_to_remove;
 
 public:
        LegacyConverter();
-       LegacyConverter(const Version &);
+
+       virtual void apply(Stage &, const Features &);
 
 private:
+       virtual void visit(Block &);
        bool check_version(const Version &) const;
-       bool check_extension(const Extension &) const;
-       using StageVisitor::visit;
+       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 &);