X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fgenerate.cpp;h=ce1283721d6f7b0796e40808b3425acd49d49b64;hb=d684e9f3007a0113c65c016ceb694eeac56a128c;hp=e5855e94cacb701c4ab96bec16324335fcccf910;hpb=3a1fe833ea04df75449706f1d773f6e65521a392;p=libs%2Fgl.git

diff --git a/source/glsl/generate.cpp b/source/glsl/generate.cpp
index e5855e94..ce128372 100644
--- a/source/glsl/generate.cpp
+++ b/source/glsl/generate.cpp
@@ -12,57 +12,6 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-void DeclarationCombiner::apply(Stage &stage)
-{
-	stage.content.visit(*this);
-	NodeRemover().apply(stage, nodes_to_remove);
-}
-
-void DeclarationCombiner::visit(Block &block)
-{
-	if(current_block)
-		return;
-
-	TraversingVisitor::visit(block);
-}
-
-void DeclarationCombiner::visit(VariableDeclaration &var)
-{
-	VariableDeclaration *&ptr = variables[var.name];
-	if(ptr)
-	{
-		ptr->type = var.type;
-		if(var.init_expression)
-			ptr->init_expression = var.init_expression;
-		if(var.layout)
-		{
-			if(ptr->layout)
-			{
-				for(vector<Layout::Qualifier>::iterator i=var.layout->qualifiers.begin(); i!=var.layout->qualifiers.end(); ++i)
-				{
-					bool found = false;
-					for(vector<Layout::Qualifier>::iterator j=ptr->layout->qualifiers.begin(); (!found && j!=ptr->layout->qualifiers.end()); ++j)
-						if(j->name==i->name)
-						{
-							j->has_value = i->value;
-							j->value = i->value;
-							found = true;
-						}
-
-					if(!found)
-						ptr->layout->qualifiers.push_back(*i);
-				}
-			}
-			else
-				ptr->layout = var.layout;
-		}
-		nodes_to_remove.insert(&var);
-	}
-	else
-		ptr = &var;
-}
-
-
 ConstantSpecializer::ConstantSpecializer():
 	values(0)
 { }
@@ -270,6 +219,9 @@ bool VariableResolver::apply(Stage &s)
 	s.interface_blocks.clear();
 	r_any_resolved = false;
 	s.content.visit(*this);
+	for(vector<VariableDeclaration *>::const_iterator i=redeclared_builtins.begin(); i!=redeclared_builtins.end(); ++i)
+		(*i)->source = GENERATED_SOURCE;
+	NodeRemover().apply(s, nodes_to_remove);
 	return r_any_resolved;
 }
 
@@ -485,10 +437,51 @@ void VariableResolver::visit(Assignment &assign)
 	assign.self_referencing = (r_self_referencing || assign.oper->token[0]!='=');
 }
 
+void VariableResolver::merge_layouts(Layout &to_layout, const Layout &from_layout)
+{
+	for(vector<Layout::Qualifier>::const_iterator i=from_layout.qualifiers.begin(); i!=from_layout.qualifiers.end(); ++i)
+	{
+		bool found = false;
+		for(vector<Layout::Qualifier>::iterator j=to_layout.qualifiers.begin(); (!found && j!=to_layout.qualifiers.end()); ++j)
+			if(j->name==i->name)
+			{
+				j->has_value = i->value;
+				j->value = i->value;
+				found = true;
+			}
+
+		if(!found)
+			to_layout.qualifiers.push_back(*i);
+	}
+}
+
 void VariableResolver::visit(VariableDeclaration &var)
 {
 	TraversingVisitor::visit(var);
-	current_block->variables.insert(make_pair(var.name, &var));
+	VariableDeclaration *&ptr = current_block->variables[var.name];
+	if(!ptr)
+		ptr = &var;
+	else if(!current_block->parent && ptr->interface==var.interface && ptr->type==var.type)
+	{
+		if(ptr->source==BUILTIN_SOURCE)
+			redeclared_builtins.push_back(&var);
+		else
+			stage->diagnostics.push_back(Diagnostic(Diagnostic::WARN, var.source, var.line,
+				format("Redeclaring non-builtin variable '%s' is deprecated", var.name)));
+
+		if(var.init_expression)
+			ptr->init_expression = var.init_expression;
+		if(var.layout)
+		{
+			if(ptr->layout)
+				merge_layouts(*ptr->layout, *var.layout);
+			else
+				ptr->layout = var.layout;
+		}
+		nodes_to_remove.insert(&var);
+
+		r_any_resolved = true;
+	}
 }
 
 void VariableResolver::visit(InterfaceBlock &iface)