X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.h;h=67d064c5328574bafe6f5bffdba2b1be081d9a94;hb=f526938b407e061c7424adedc34af4d1ff687f90;hp=c932767e99807325f159372e626895aafa213c5b;hpb=1cd0ea7f79b2b0dedd8a2a6622e5d2e8b2ea2512;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.h b/source/glsl/optimize.h
index c932767e..67d064c5 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 &);
@@ -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 &);
@@ -165,6 +168,28 @@ private:
 	virtual void visit(Iteration &);
 };
 
+/** Removes types which are not used anywhere. */
+class UnusedTypeRemover: private TraversingVisitor
+{
+private:
+	std::set<Node *> unused_nodes;
+
+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 &);
+};
+
 /** Removes variable declarations with no references to them.  Assignment
 statements where the result is not used are also removed. */
 class UnusedVariableRemover: private TraversingVisitor
@@ -200,6 +225,7 @@ private:
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
+	virtual void visit(Swizzle &);
 	virtual void visit(UnaryExpression &);
 	virtual void visit(BinaryExpression &);
 	virtual void visit(Assignment &);