X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=28f5e87688629634f9e05734e61cdbc1c5995ad1;hb=455fbb0b9c7d7c4b66cc969ad0e9915fe95e420f;hp=390dd64ea98f668639e6733447f29ac5895368f2;hpb=d5c7c7f0b15c407b3da2184936e6deed18554c6a;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 390dd64e..28f5e876 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -45,9 +45,9 @@ private:
 	std::map<std::string, VariableDeclaration *> variable_map;
 	bool remap_names;
 	bool deps_only;
-	RefPtr<Statement> inlined_statement;
+	RefPtr<Statement> r_inlined_statement;
 	std::set<Node *> dependencies;
-	std::string result_name;
+	std::string r_result_name;
 
 public:
 	InlineContentInjector();
@@ -74,8 +74,8 @@ private:
 	std::set<FunctionDeclaration *> inlineable;
 	FunctionDeclaration *current_function;
 	NodeList<Statement>::iterator insert_point;
-	RefPtr<Expression> inline_result;
-	bool any_inlined;
+	RefPtr<Expression> r_inline_result;
+	bool r_any_inlined;
 
 public:
 	FunctionInliner();
@@ -93,6 +93,8 @@ private:
 	virtual void visit(ExpressionStatement &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Conditional &);
+	virtual void visit(Iteration &);
 	virtual void visit(Return &);
 };
 
@@ -141,10 +143,10 @@ private:
 	std::map<VariableDeclaration *, Node *> aggregates;
 	Node *aggregate;
 	std::vector<BlockVariableMap> variables;
-	Assignment *assignment;
+	Assignment *r_assignment;
 	bool assignment_target;
-	bool assign_to_subscript;
-	bool side_effects;
+	bool r_assign_to_subfield;
+	bool r_side_effects;
 
 public:
 	UnusedVariableRemover();