X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=2215f8335cd06a23ea71e2c381cb1776362b81cd;hb=3f899b1fc2e04f4fe74c99ad3e8ebb900c257214;hp=1f5b5d317c720993b91f2dbc5dd8fb880417cd7c;hpb=5c33b56c3b97ca0381ac216a603c7553f4bea499;p=libs%2Fgl.git

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 1f5b5d31..2215f833 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -14,7 +14,7 @@ InlineableFunctionLocator::InlineableFunctionLocator():
 void InlineableFunctionLocator::visit(FunctionCall &call)
 {
 	FunctionDeclaration *def = call.declaration;
-	if(def && def->definition!=def)
+	if(def)
 		def = def->definition;
 
 	if(def)
@@ -95,7 +95,7 @@ void FunctionInliner::visit(FunctionCall &call)
 		visit_and_inline(*i);
 
 	FunctionDeclaration *def = call.declaration;
-	if(def && def->definition!=def)
+	if(def)
 		def = def->definition;
 
 	if(def && inlineable.count(def))
@@ -160,7 +160,13 @@ void ConstantConditionEliminator::visit(Assignment &assign)
 
 void ConstantConditionEliminator::visit(VariableDeclaration &var)
 {
-	if(var.constant || current_block->parent)
+	bool constant = var.constant;
+	if(constant && var.layout)
+	{
+		for(vector<Layout::Qualifier>::const_iterator i=var.layout->qualifiers.begin(); (constant && i!=var.layout->qualifiers.end()); ++i)
+			constant = (i->name!="constant_id");
+	}
+	if((constant || current_block->parent) && var.init_expression)
 		variable_values[&var] = var.init_expression.get();
 }
 
@@ -259,11 +265,16 @@ void UnusedVariableRemover::visit(VariableReference &var)
 	if(var.declaration && !assignment_target)
 	{
 		VariableInfo &var_info = variables.back()[var.declaration];
-		var_info.assignments.clear();
+		clear_assignments(var_info, false);
 		var_info.referenced = true;
 	}
 }
 
+void UnusedVariableRemover::visit(InterfaceBlockReference &iface)
+{
+	unused_nodes.erase(iface.declaration);
+}
+
 void UnusedVariableRemover::visit(MemberAccess &memacc)
 {
 	TraversingVisitor::visit(memacc);
@@ -436,7 +447,7 @@ void UnusedVariableRemover::visit(Iteration &iter)
 	BlockVariableMap &block_variables = variables.back();
 	for(BlockVariableMap::iterator i=block_variables.begin(); i!=block_variables.end(); ++i)
 		if(!i->second.local && i->second.referenced)
-			i->second.assignments.clear();
+			clear_assignments(i->second, false);
 
 	merge_down_variables();
 }