X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fresolve.cpp;h=c5a507a222a96558a7582d72b8725216889d9fa7;hp=8bfe635ee73b8d2f3c0dd1bd9dd7414313117263;hb=dfcf8ebc329b79c369b88bdbeb982480aa5fc12a;hpb=48461f515f2619ab480b4d6c1d61deaf91e73854

diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp
index 8bfe635e..c5a507a2 100644
--- a/source/glsl/resolve.cpp
+++ b/source/glsl/resolve.cpp
@@ -226,28 +226,42 @@ void VariableResolver::visit(VariableReference &var)
 	{
 		const map<string, InterfaceBlock *> &blocks = stage->interface_blocks;
 		map<string, InterfaceBlock *>::const_iterator i = blocks.find(var.name);
+		if(i==blocks.end())
+		{
+			// Look for the variable in anonymous interface blocks.
+			for(i=blocks.begin(); i!=blocks.end(); ++i)
+				if(i->second->instance_name.empty() && i->second->struct_declaration)
+					if(i->second->struct_declaration->members.variables.count(var.name))
+						break;
+		}
+
 		if(i!=blocks.end())
 		{
-			/* The name refers to an interface block with an instance name rather
-			than a variable.  Prepare a new syntax tree node accordingly. */
+			/* The name refers to either an interface block with an instance name
+			or a variable declared inside an anonymous interface block.  Prepare
+			new syntax tree nodes accordingly. */
 			InterfaceBlockReference *iface_ref = new InterfaceBlockReference;
 			iface_ref->source = var.source;
 			iface_ref->line = var.line;
-			iface_ref->name = var.name;
 			iface_ref->declaration = i->second;
-			r_replacement_expr = iface_ref;
-		}
-		else
-		{
-			// Look for the variable in anonymous interface blocks.
-			for(i=blocks.begin(); (!declaration && i!=blocks.end()); ++i)
-				if(i->second->instance_name.empty() && i->second->struct_declaration)
-				{
-					const map<string, VariableDeclaration *> &iface_vars = i->second->struct_declaration->members.variables;
-					map<string, VariableDeclaration *>::const_iterator j = iface_vars.find(var.name);
-					if(j!=iface_vars.end())
-						declaration = j->second;
-				}
+
+			if(i->second->instance_name.empty())
+			{
+				iface_ref->name = format("%s %s", i->second->interface, i->second->block_name);
+
+				MemberAccess *memacc = new MemberAccess;
+				memacc->source = var.source;
+				memacc->line = var.line;
+				memacc->left = iface_ref;
+				memacc->member = var.name;
+
+				r_replacement_expr = memacc;
+			}
+			else
+			{
+				iface_ref->name = var.name;
+				r_replacement_expr = iface_ref;
+			}
 		}
 	}