Always use member access for interface blocks, even anonymous ones

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

diff --git a/source/glsl/output.h b/source/glsl/output.h
index b8554b7d1aa83eb95f89e1647a280492883065e3..ef9369876b46c00221ad6e33093c6e76153fee93 100644 (file)
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -9,22 +9,23 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+/** Formats the syntax tree as GLSL. */
 class Formatter: private TraversingVisitor
 {
 private:
        Stage *stage;
-       Compiler::Mode mode;
        std::string formatted;
        unsigned source_index;
        unsigned source_line;
        unsigned indent;
        bool parameter_list;
-       std::string block_interface;
+       bool omit_builtin;
+       bool r_empty_name;
 
 public:
        Formatter();
 
-       const std::string &apply(Stage &, Compiler::Mode);
+       const std::string &apply(Stage &);
        const std::string &apply(Node &n) { n.visit(*this); return formatted; }
 
 private:
@@ -33,13 +34,16 @@ private:
        void set_source(unsigned, unsigned);
 
        virtual void visit(Block &);
+       void visit_expression(Expression &, const Operator *, bool);
        virtual void visit(Literal &);
-       virtual void visit(ParenthesizedExpression &);
        virtual void visit(VariableReference &);
+       virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
+       virtual void visit(Swizzle &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(TernaryExpression &);
        virtual void visit(FunctionCall &);
        virtual void visit(ExpressionStatement &);
        virtual void visit(Import &);