X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fcompatibility.cpp;h=193ae123fae31126b6b23d740df12cd55a9fa6d2;hb=cc3f4aaaf8d2b34347f69b026c10f82797059aa4;hp=a5ba8247a53d705c82223d9b8241e5d28dbea14e;hpb=02c43c5aebb2214af8144eaf19f25b9a04aa2414;p=libs%2Fgl.git

diff --git a/source/glsl/compatibility.cpp b/source/glsl/compatibility.cpp
index a5ba8247..193ae123 100644
--- a/source/glsl/compatibility.cpp
+++ b/source/glsl/compatibility.cpp
@@ -172,8 +172,8 @@ void LegacyConverter::visit(VariableReference &var)
 void LegacyConverter::visit(Assignment &assign)
 {
 	TraversingVisitor::visit(assign);
-	if(assign.target_declaration==frag_out && !supports_unified_interface_syntax())
-		assign.target_declaration = 0;
+	if(assign.target.declaration==frag_out && !supports_unified_interface_syntax())
+		assign.target.declaration = 0;
 }
 
 bool LegacyConverter::supports_unified_sampling_functions() const
@@ -341,15 +341,20 @@ bool LegacyConverter::supports_interface_blocks(const string &iface) const
 
 void LegacyConverter::visit(InterfaceBlock &iface)
 {
-	if(!supports_interface_blocks(iface.interface))
+	if(!supports_interface_blocks(iface.interface) && iface.type_declaration)
 	{
 		if(!iface.instance_name.empty())
 			unsupported("ARB_uniform_buffer_object required for interface block instances");
-		else
+		else if(iface.struct_declaration)
 		{
-			stage->content.body.splice(uniform_insert_point, iface.members.body);
+			stage->content.body.splice(uniform_insert_point, iface.struct_declaration->members.body);
 			nodes_to_remove.insert(&iface);
+			nodes_to_remove.insert(iface.struct_declaration);
 		}
+		else
+			/* If the interface block is an array, it should have an instance
+			name too, so this should never be reached */
+			throw logic_error("Unexpected interface block configuration");
 	}
 }