X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=26076452efe58776ac092a8ce6ad840f63345b14;hb=5b33d00373c6f4953d684f8cc75c9353df469735;hp=652ac252cf32bf5a3015f3e87441826df8b29296;hpb=caa84a9d8adce6dc702f6e0ae32961b77a0a73ea;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 652ac252..26076452 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -83,20 +83,11 @@ public:
 	bool apply(Stage &);
 
 private:
-	void visit_and_inline(RefPtr<Expression> &);
-
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(Block &);
-	virtual void visit(UnaryExpression &);
-	virtual void visit(BinaryExpression &);
-	virtual void visit(Assignment &a) { visit(static_cast<BinaryExpression &>(a)); }
-	virtual void visit(MemberAccess &);
 	virtual void visit(FunctionCall &);
-	virtual void visit(ExpressionStatement &);
-	virtual void visit(VariableDeclaration &);
 	virtual void visit(FunctionDeclaration &);
-	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	virtual void visit(Return &);
 };
 
 /** Inlines variables into expressions.  Variables with trivial values (those
@@ -119,7 +110,7 @@ private:
 		ExpressionInfo();
 	};
 
-	std::map<VariableDeclaration *, ExpressionInfo> expressions;
+	std::map<Assignment::Target, ExpressionInfo> expressions;
 	ExpressionInfo *r_ref_info;
 	bool r_any_inlined;
 	bool r_trivial;
@@ -137,16 +128,16 @@ private:
 	void visit_and_record(RefPtr<Expression> &, const Operator *, bool);
 	void inline_expression(Expression &, RefPtr<Expression> &, const Operator *, const Operator *, bool);
 	virtual void visit(Block &);
+	virtual void visit(RefPtr<Expression> &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
-	virtual void visit(Return &);
 };
 
 /** Removes conditional statements and loops where the condition can be
@@ -184,6 +175,7 @@ private:
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -194,23 +186,24 @@ class UnusedVariableRemover: private TraversingVisitor
 private:
 	struct VariableInfo
 	{
-		bool local;
 		std::vector<Node *> assignments;
+		bool local;
+		bool output;
 		bool conditionally_assigned;
 		bool referenced;
+		InterfaceBlock *interface_block;
 
 		VariableInfo();
 	};
 
-	typedef std::map<VariableDeclaration *, VariableInfo> BlockVariableMap;
+	typedef std::map<Assignment::Target, VariableInfo> BlockVariableMap;
 
+	Stage *stage;
 	std::set<Node *> unused_nodes;
-	std::map<VariableDeclaration *, Node *> aggregates;
-	Node *aggregate;
 	std::vector<BlockVariableMap> variables;
+	InterfaceBlock *interface_block;
 	Assignment *r_assignment;
 	bool assignment_target;
-	bool r_assign_to_subfield;
 	bool r_side_effects;
 
 public:
@@ -219,17 +212,18 @@ public:
 	bool apply(Stage &);
 
 private:
+	void reference_used(Statement &);
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
-	virtual void visit(MemberAccess &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
-	void record_assignment(VariableDeclaration &, Node &, bool);
+	void record_assignment(const Assignment::Target &, Node &, bool);
 	void clear_assignments(VariableInfo &, bool);
 	virtual void visit(FunctionCall &);
 	virtual void visit(ExpressionStatement &);
-	virtual void visit(StructDeclaration &);
+	// Ignore structs because their members can't be accessed directly.
+	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);