From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 21 Jun 2019 08:23:21 +0000 (+0300)
Subject: Merge variable declaration layouts
X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=commitdiff_plain;h=5089933d82e69c4485843781aa4c762fc0c49be7

Merge variable declaration layouts
---

diff --git a/source/programcompiler.cpp b/source/programcompiler.cpp
index 6b8d2eb8..9a3986a1 100644
--- a/source/programcompiler.cpp
+++ b/source/programcompiler.cpp
@@ -643,6 +643,27 @@ void ProgramCompiler::DeclarationCombiner::visit(VariableDeclaration &var)
 		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->identifier==i->identifier)
+						{
+							j->value = i->value;
+							found = true;
+						}
+
+					if(!found)
+						ptr->layout->qualifiers.push_back(*i);
+				}
+			}
+			else
+				ptr->layout = var.layout;
+		}
 		remove_node = true;
 	}
 	else