X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Ffinalize.cpp;h=192baec550e111313c76a5cde659e37c6604fba8;hp=94007b8fc3eda25f24b91deff5425549de70ce15;hb=eb7ffda6876bd2eeeb64dcb7c82236f36fe5cf43;hpb=a12f4941e78e1cc0070c5256180a18bb892adcb1

diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp
index 94007b8f..192baec5 100644
--- a/source/glsl/finalize.cpp
+++ b/source/glsl/finalize.cpp
@@ -55,11 +55,7 @@ void StructOrganizer::visit(VariableDeclaration &var)
 			if(!var.layout)
 				var.layout = new Layout;
 
-			Layout::Qualifier qual;
-			qual.name = "offset";
-			qual.has_value = true;
-			qual.value = offset;
-			var.layout->qualifiers.push_back(qual);
+			var.layout->qualifiers.push_back(Layout::Qualifier("offset", offset));
 		}
 
 		if(!has_matrix_order)
@@ -68,11 +64,7 @@ void StructOrganizer::visit(VariableDeclaration &var)
 			while(basic && basic->kind==BasicTypeDeclaration::ARRAY)
 				basic = dynamic_cast<const BasicTypeDeclaration *>(basic->base_type);
 			if(basic && basic->kind==BasicTypeDeclaration::MATRIX)
-			{
-				Layout::Qualifier qual;
-				qual.name = "column_major";
-				var.layout->qualifiers.push_back(qual);
-			}
+				var.layout->qualifiers.push_back(Layout::Qualifier("column_major"));
 		}
 
 		offset += mem_reqs.size;
@@ -177,11 +169,7 @@ void LocationAllocator::add_layout_value(RefPtr<Layout> &layout, const string &n
 	if(!layout)
 		layout = new Layout;
 
-	Layout::Qualifier qual;
-	qual.name = name;
-	qual.has_value = true;
-	qual.value = value;
-	layout->qualifiers.push_back(qual);
+	layout->qualifiers.push_back(Layout::Qualifier(name, value));
 }
 
 void LocationAllocator::visit(VariableDeclaration &var)