X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=1aad8d1b311adcecf27904b8e29efb49892d98a6;hb=50ab5ca;hp=88a323992636b0642d05d4134ee81d68bdebce9c;hpb=a204b5fac497e2ffbc6791f0f7de9d9d12c16d52;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 88a32399..1aad8d1b 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -629,6 +629,29 @@ bool UnusedTypeRemover::apply(Stage &stage)
 	return !unused_nodes.empty();
 }
 
+void UnusedTypeRemover::visit(Literal &literal)
+{
+	unused_nodes.erase(literal.type);
+}
+
+void UnusedTypeRemover::visit(UnaryExpression &unary)
+{
+	unused_nodes.erase(unary.type);
+	TraversingVisitor::visit(unary);
+}
+
+void UnusedTypeRemover::visit(BinaryExpression &binary)
+{
+	unused_nodes.erase(binary.type);
+	TraversingVisitor::visit(binary);
+}
+
+void UnusedTypeRemover::visit(FunctionCall &call)
+{
+	unused_nodes.erase(call.type);
+	TraversingVisitor::visit(call);
+}
+
 void UnusedTypeRemover::visit(BasicTypeDeclaration &type)
 {
 	if(type.base_type)
@@ -646,6 +669,7 @@ void UnusedTypeRemover::visit(ImageTypeDeclaration &type)
 void UnusedTypeRemover::visit(StructDeclaration &strct)
 {
 	unused_nodes.insert(&strct);
+	TraversingVisitor::visit(strct);
 }
 
 void UnusedTypeRemover::visit(VariableDeclaration &var)
@@ -653,6 +677,12 @@ void UnusedTypeRemover::visit(VariableDeclaration &var)
 	unused_nodes.erase(var.type_declaration);
 }
 
+void UnusedTypeRemover::visit(FunctionDeclaration &func)
+{
+	unused_nodes.erase(func.return_type_declaration);
+	TraversingVisitor::visit(func);
+}
+
 
 UnusedVariableRemover::UnusedVariableRemover():
 	aggregate(0),