X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.h;h=efcde5d66f30440bfbcbe24bee9c39ce86d34c29;hb=bde40be11da83206f3d33a8225963d47a413662e;hp=66b77bbaaca62a391cce7b022b68473a2f9595e5;hpb=bd8816692056230c36504dcccd76c6946dff47b1;p=libs%2Fgl.git

diff --git a/source/glsl/output.h b/source/glsl/output.h
index 66b77bba..efcde5d6 100644
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -9,22 +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;
+	bool omit_builtin;
 
 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,14 +33,17 @@ 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 &);