X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=4663c12ec12e6ffcaf4fe946fff5bbc36cc5ed90;hb=daff631cf87db75bcae616605e759d281258d9e4;hp=92e19c8c9be08a8a649586929c0755607e558fab;hpb=ff00056daddbce2e6e16f7c09dcfcb5cde66e85c;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index 92e19c8c..4663c12e 100644
--- a/source/glsl/optimize.h
+++ b/source/glsl/optimize.h
@@ -88,7 +88,9 @@ private:
 	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(Swizzle &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(ExpressionStatement &);
 	virtual void visit(VariableDeclaration &);
@@ -118,7 +120,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;
@@ -138,6 +140,7 @@ private:
 	virtual void visit(Block &);
 	virtual void visit(VariableReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);
@@ -175,10 +178,15 @@ public:
 	bool apply(Stage &);
 
 private:
+	virtual void visit(Literal &);
+	virtual void visit(UnaryExpression &);
+	virtual void visit(BinaryExpression &);
+	virtual void visit(FunctionCall &);
 	virtual void visit(BasicTypeDeclaration &);
 	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 };
 
@@ -189,23 +197,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:
@@ -214,17 +223,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 &);