X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Foptimize.h;h=bffc5a036197cc7f3a46e829018a38d98dac7495;hb=6592dca643d9ac5b99d6a43cae30554ac1e4df62;hp=1262823f53ead86c058734fc0d62841b70f7dea3;hpb=5e4204ecaf54f49b63587ef5cd669a1b3838e0e9;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 1262823f..bffc5a03 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -44,7 +44,6 @@ private:
 	std::map<std::string, VariableDeclaration *> variable_map;
 	std::string remap_prefix;
 	unsigned remap_names;
-	bool deps_only;
 	RefPtr<Statement> r_inlined_statement;
 	std::set<Node *> dependencies;
 	std::set<std::string> referenced_names;
@@ -75,6 +74,7 @@ private:
 	NodeList<Statement>::iterator insert_point;
 	RefPtr<Expression> r_inline_result;
 	bool r_any_inlined;
+	bool r_inlined_here;
 
 public:
 	FunctionInliner();
@@ -191,6 +191,7 @@ private:
 
 	NodeList<Statement>::iterator insert_point;
 	std::set<Node *> nodes_to_remove;
+	RefPtr<Expression> r_ternary_result;
 
 public:
 	void apply(Stage &);
@@ -199,6 +200,8 @@ private:
 	ConstantStatus check_constant_condition(const Expression &);
 
 	virtual void visit(Block &);
+	virtual void visit(RefPtr<Expression> &);
+	virtual void visit(TernaryExpression &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
 };