X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.h;h=61c02caada72aed11f5e7361c55b639ccde449b9;hb=f526938b407e061c7424adedc34af4d1ff687f90;hp=5f741909062f2f9ada8fce46ae0fc7fe3502e02c;hpb=ede0bc3f5c7124ef100576ad4b0890c9cd13c79d;p=libs%2Fgl.git diff --git a/source/glsl/output.h b/source/glsl/output.h index 5f741909..61c02caa 100644 --- a/source/glsl/output.h +++ b/source/glsl/output.h @@ -1,6 +1,7 @@ #ifndef MSP_GL_SL_OUTPUT_H_ #define MSP_GL_SL_OUTPUT_H_ +#include "compiler.h" #include "syntax.h" #include "visitor.h" @@ -8,21 +9,22 @@ 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; public: Formatter(); - const std::string &apply(Stage &); + const std::string &apply(Stage &, Compiler::Mode); const std::string &apply(Node &n) { n.visit(*this); return formatted; } private: @@ -34,7 +36,9 @@ private: 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 &); @@ -50,9 +54,9 @@ private: virtual void visit(FunctionDeclaration &); virtual void visit(Conditional &); virtual void visit(Iteration &); + virtual void visit(Passthrough &); virtual void visit(Return &); virtual void visit(Jump &); - using TraversingVisitor::visit; }; } // namespace SL