X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=32f7ce67959b388fa1bc2c2fb58ecc344a11bb87;hb=2280a09a286bbff2eb41783f8023863f320a3736;hp=d7558ebde6c095b240943d4b317840425b46282a;hpb=42903b905cd3924ecc45d3cb08222bc3548cab91;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index d7558ebd..32f7ce67 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -123,7 +123,7 @@ InlineContentInjector::InlineContentInjector():
 	pass(REFERENCED)
 { }
 
-const string &InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_func, Block &tgt_blk, const NodeList<Statement>::iterator &ins_pt, FunctionCall &call)
+string InlineContentInjector::apply(Stage &stage, FunctionDeclaration &target_func, Block &tgt_blk, const NodeList<Statement>::iterator &ins_pt, FunctionCall &call)
 {
 	source_func = call.declaration->definition;
 
@@ -997,10 +997,6 @@ bool UnusedVariableRemover::apply(Stage &s)
 		if(i->used_by.empty())
 			unused_nodes.insert(i->node);
 
-	for(map<string, InterfaceBlock *>::const_iterator i=s.interface_blocks.begin(); i!=s.interface_blocks.end(); ++i)
-		if(i->second->instance_name.empty())
-			unused_nodes.insert(i->second);
-
 	for(BlockVariableMap::const_iterator i=variables.begin(); i!=variables.end(); ++i)
 	{
 		if(i->second.output)
@@ -1153,16 +1149,8 @@ void UnusedVariableRemover::visit(VariableDeclaration &var)
 
 void UnusedVariableRemover::visit(InterfaceBlock &iface)
 {
-	if(iface.instance_name.empty())
-	{
-		SetForScope<InterfaceBlock *> set_block(interface_block, &iface);
-		iface.struct_declaration->members.visit(*this);
-	}
-	else
-	{
-		VariableInfo &var_info = variables[&iface];
-		var_info.output = (iface.interface=="out" && (iface.linked_block || !iface.block_name.compare(0, 3, "gl_")));
-	}
+	VariableInfo &var_info = variables[&iface];
+	var_info.output = (iface.interface=="out" && (iface.linked_block || !iface.block_name.compare(0, 3, "gl_")));
 }
 
 void UnusedVariableRemover::merge_variables(const BlockVariableMap &other_vars)