X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.h;h=09cdf0714fb735103ba1cbedac9e2e53239d97fe;hb=c4aeeced7b397d46772577775bd3a0d6c4706cba;hp=58983fcab68176faff98ed7666ff4c9aa6891d3b;hpb=cfee1ea700d860db170fd1621f3716bc47b677f8;p=libs%2Fgl.git

diff --git a/source/glsl/output.h b/source/glsl/output.h
index 58983fca..09cdf071 100644
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -19,12 +19,13 @@ private:
 	unsigned source_line;
 	unsigned indent;
 	bool parameter_list;
+	bool omit_builtin;
+	bool r_empty_name;
 
 public:
 	Formatter();
 
-	const std::string &apply(Stage &);
-	const std::string &apply(Node &n) { n.visit(*this); return formatted; }
+	std::string apply(Stage &);
 
 private:
 	void append(const std::string &);
@@ -32,8 +33,8 @@ 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 &);
@@ -41,6 +42,7 @@ private:
 	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 &);