X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.h;h=1e59a445ebdd1f16eead08246ac98196b3a286ca;hb=2280a09a286bbff2eb41783f8023863f320a3736;hp=61c02caada72aed11f5e7361c55b639ccde449b9;hpb=f526938b407e061c7424adedc34af4d1ff687f90;p=libs%2Fgl.git

diff --git a/source/glsl/output.h b/source/glsl/output.h
index 61c02caa..1e59a445 100644
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -14,18 +14,19 @@ class Formatter: private TraversingVisitor
 {
 private:
 	Stage *stage;
-	Compiler::Mode mode;
 	std::string formatted;
 	unsigned source_index;
 	unsigned source_line;
 	unsigned indent;
 	bool parameter_list;
+	bool omit_builtin;
+	bool r_empty_name;
 
 public:
 	Formatter();
 
-	const std::string &apply(Stage &, Compiler::Mode);
-	const std::string &apply(Node &n) { n.visit(*this); return formatted; }
+	std::string apply(Stage &);
+	std::string apply(Node &n) { n.visit(*this); return formatted; }
 
 private:
 	void append(const std::string &);
@@ -33,8 +34,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 &);
@@ -42,6 +43,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 &);