X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Freflect.cpp;h=e64b9a3c5f175fe6cf3d046f80da15990686456a;hb=08d3b5a55fad7439b47fc93d8ba604cbeb7e19ca;hp=a1ffcd3d449783caf24aa9c79d4c403199972234;hpb=0585e361d8714ac4efc3ae3e1d5c8c9aa8841c34;p=libs%2Fgl.git

diff --git a/source/glsl/reflect.cpp b/source/glsl/reflect.cpp
index a1ffcd3d..e64b9a3c 100644
--- a/source/glsl/reflect.cpp
+++ b/source/glsl/reflect.cpp
@@ -178,7 +178,9 @@ void TypeComparer::visit(ImageTypeDeclaration &image)
 	{
 		if(image1->dimensions!=image.dimensions || image1->array!=image.array)
 			r_result = false;
-		else if(image1->sampled!=image.sampled || image1->shadow!=image.shadow)
+		else if(image1->sampled!=image.sampled || image1->shadow!=image.shadow || image1->multisample!=image.multisample)
+			r_result = false;
+		else if(image1->format!=image.format)
 			r_result = false;
 		else if(image1->base_type && image.base_type)
 			compare(*image1->base_type, *image.base_type);
@@ -219,6 +221,8 @@ void TypeComparer::visit(VariableDeclaration &var)
 				r_result = false;
 				if(var1->array_size && var.array_size)
 					compare(*var1->array_size, *var.array_size);
+				else if(!var1->array_size && !var.array_size)
+					r_result = true;
 			}
 			if(r_result && var1->type_declaration!=var.type_declaration)
 				compare(*var1->type_declaration, *var.type_declaration);
@@ -346,15 +350,6 @@ void DependencyCollector::visit(VariableReference &var)
 	}
 }
 
-void DependencyCollector::visit(InterfaceBlockReference &iface)
-{
-	if(iface.declaration)
-	{
-		dependencies.insert(iface.declaration);
-		iface.declaration->visit(*this);
-	}
-}
-
 void DependencyCollector::visit(FunctionCall &call)
 {
 	if(call.declaration)
@@ -400,12 +395,6 @@ void AssignmentCollector::visit(VariableReference &var)
 		assigned_variables.insert(var.declaration);
 }
 
-void AssignmentCollector::visit(InterfaceBlockReference &iface)
-{
-	if(assignment_target)
-		assigned_variables.insert(iface.declaration);
-}
-
 void AssignmentCollector::visit(UnaryExpression &unary)
 {
 	SetFlag set_assignment(assignment_target, (unary.oper->token[1]=='+' || unary.oper->token[1]=='-'));