X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=4550b51c29360997e12c728208cb7c1decca0ba5;hp=3387667283b425c4f9fdb74245b1da577c2b9d5b;hb=3773733011653d67e47768cf031e95f8f68cf714;hpb=180698dbb41d312128c496721f1207c6688fe350

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 33876672..4550b51c 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -134,7 +134,7 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration
 
 InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block)
 {
-	if(stage->interface_blocks.count("in"+out_block.block_name))
+	if(stage->interface_blocks.count("in "+out_block.block_name))
 		return 0;
 
 	InterfaceBlock *in_block = new InterfaceBlock;
@@ -160,9 +160,9 @@ InterfaceBlock *InterfaceGenerator::generate_interface(InterfaceBlock &out_block
 	}
 
 	iface_target_block->body.insert(iface_insert_point, in_block);
-	stage->interface_blocks.insert(make_pair("in"+in_block->block_name, in_block));
+	stage->interface_blocks.insert(make_pair("in "+in_block->block_name, in_block));
 	if(!in_block->instance_name.empty())
-		stage->interface_blocks.insert(make_pair("_"+in_block->instance_name, in_block));
+		stage->interface_blocks.insert(make_pair(in_block->instance_name, in_block));
 
 	SetFlag set_scope(function_scope, false);
 	SetForScope<Block *> set_block(current_block, &stage->content);
@@ -215,7 +215,7 @@ void InterfaceGenerator::visit(VariableReference &var)
 	}
 
 	const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
-	map<string, InterfaceBlock *>::const_iterator j = prev_blocks.find("_"+var.name);
+	map<string, InterfaceBlock *>::const_iterator j = prev_blocks.find(var.name);
 	if(j!=prev_blocks.end() && j->second->interface=="out")
 	{
 		generate_interface(*j->second);
@@ -291,7 +291,7 @@ void InterfaceGenerator::visit(InterfaceBlock &iface)
 		if(!iface.linked_block && stage->previous)
 		{
 			const map<string, InterfaceBlock *> &prev_blocks = stage->previous->interface_blocks;
-			map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find("out"+iface.block_name);
+			map<string, InterfaceBlock *>::const_iterator i = prev_blocks.find("out "+iface.block_name);
 			if(i!=prev_blocks.end())
 			{
 				iface.linked_block = i->second;