X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foptimize.cpp;h=2215f8335cd06a23ea71e2c381cb1776362b81cd;hp=3f63dd8a7debaac0c492c0f3f5a2e9491d989ebf;hb=6288c42adde9ee7d39a47de51fa2856cf965dccc;hpb=7f29c6d2a4eee36538d7ccf24980e749592e2444

diff --git a/source/glsl/optimize.cpp b/source/glsl/optimize.cpp
index 3f63dd8a..2215f833 100644
--- a/source/glsl/optimize.cpp
+++ b/source/glsl/optimize.cpp
@@ -160,7 +160,13 @@ void ConstantConditionEliminator::visit(Assignment &assign)
 
 void ConstantConditionEliminator::visit(VariableDeclaration &var)
 {
-	if((var.constant || current_block->parent) && var.init_expression)
+	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();
 }