X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=ab487a44c470bca769af032b9ce2966c7a0df5d2;hp=01d34c63cd5f1b0eb99060b59b8abd533f41401f;hb=9229a3e70dace406d897148857ed6567986c3bcd;hpb=d1feb41b3ff4dd462f50891e8901bad39466b75c

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index 01d34c63..ab487a44 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -1065,6 +1065,8 @@ VariableDeclaration *InterfaceGenerator::generate_interface(VariableDeclaration
 
 	iface_target_block->body.insert(iface_insert_point, iface_var);
 	iface_target_block->variables.insert(make_pair(name, iface_var));
+	if(iface_target_block==&stage->content && iface=="in")
+		declared_inputs.push_back(iface_var);
 
 	return iface_var;
 }
@@ -1197,11 +1199,13 @@ void InterfaceGenerator::visit(VariableDeclaration &var)
 			}
 		}
 	}
-	else if(var.interface=="in")
+	else if(var.interface=="in" && current_block==&stage->content)
 	{
+		declared_inputs.push_back(&var);
+
 		/* Try to link input variables in global scope with output variables from
 		previous stage. */
-		if(current_block==&stage->content && !var.linked_declaration && stage->previous)
+		if(!var.linked_declaration && stage->previous)
 		{
 			const map<string, VariableDeclaration *> &prev_vars = stage->previous->content.variables;
 			map<string, VariableDeclaration *>::const_iterator i = prev_vars.find(var.name);
@@ -1246,12 +1250,8 @@ void InterfaceGenerator::visit(FunctionDeclaration &func)
 
 void InterfaceGenerator::visit(Passthrough &pass)
 {
-	vector<VariableDeclaration *> pass_vars;
-
-	// Pass through all input variables of this stage.
-	for(map<string, VariableDeclaration *>::const_iterator i=stage->content.variables.begin(); i!=stage->content.variables.end(); ++i)
-		if(i->second->interface=="in")
-			pass_vars.push_back(i->second);
+	// Pass through all input variables declared so far.
+	vector<VariableDeclaration *> pass_vars = declared_inputs;
 
 	if(stage->previous)
 	{