X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=6d8a6194e7e9f5d2076fa81938a75aff421e39c2;hb=83186c4a01ada8bfb0199c4396c0aaa64631577f;hp=e21dd98fd0fcbe63e578e3012cd072d108c5437d;hpb=55a18f710f07c51f05d0dc55741a7f3cc8e70cdd;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index e21dd98f..6d8a6194 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -175,13 +175,16 @@ public:
 	bool apply(Stage &s) { s.content.visit(*this); return r_any_folded; }
 
 private:
-	static BasicTypeDeclaration::Kind get_value_kind(const Variant &);
 	template<typename T>
 	static T evaluate_logical(char, T, T);
 	template<typename T>
 	static bool evaluate_relation(const char *, T, T);
 	template<typename T>
 	static T evaluate_arithmetic(char, T, T);
+	template<typename T>
+	static T evaluate_int_special_op(char, T, T);
+	template<typename T>
+	void convert_to_result(const Variant &);
 	void set_result(const Variant &, bool = false);
 
 	virtual void visit(RefPtr<Expression> &);
@@ -276,6 +279,7 @@ private:
 		Node *node;
 		Assignment::Target target;
 		std::vector<Node *> used_by;
+		unsigned in_loop;
 
 		AssignmentInfo(): node(0) { }
 	};
@@ -300,7 +304,10 @@ private:
 	Assignment *r_assignment;
 	bool assignment_target;
 	bool r_side_effects;
+	bool in_struct;
 	bool composite_reference;
+	unsigned in_loop;
+	std::vector<Node *> loop_ext_refs;
 	Assignment::Target r_reference;
 	std::set<Node *> unused_nodes;
 
@@ -323,8 +330,7 @@ private:
 	virtual void visit(FunctionCall &);
 	void record_assignment(const Assignment::Target &, Node &);
 	virtual void visit(ExpressionStatement &);
-	// Ignore structs because their members can't be accessed directly.
-	virtual void visit(StructDeclaration &) { }
+	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
 	void merge_variables(const BlockVariableMap &);