X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fglsl%2Ffinalize.cpp;fp=source%2Fglsl%2Ffinalize.cpp;h=469cb92daba088493168f82f55e47a4b5938dccd;hb=0fdc229b8b43f1897de4611672ac65b4db954be0;hp=d840648bbc3ec0135bbb02b4dc47350cf753f03f;hpb=857e0a3f684fba4810260697a78a769dff514f1f;p=libs%2Fgl.git

diff --git a/source/glsl/finalize.cpp b/source/glsl/finalize.cpp
index d840648b..469cb92d 100644
--- a/source/glsl/finalize.cpp
+++ b/source/glsl/finalize.cpp
@@ -91,6 +91,8 @@ void LocationAllocator::apply(Stage &stage)
 	stage.content.visit(*this);
 
 	allocate_locations("in");
+	if(stage.type==Stage::VERTEX)
+		swap(used_locations["in"], used_vertex_attribs);
 	allocate_locations("out");
 }
 
@@ -121,6 +123,8 @@ void LocationAllocator::allocate_locations(const string &iface)
 		if(!alloc_new)
 			continue;
 
+		bool flat = ((*i)->interpolation=="flat" || ((*i)->linked_declaration && (*i)->linked_declaration->interpolation=="flat"));
+
 		set<unsigned> &used = used_locations[(*i)->interface];
 
 		unsigned size = LocationCounter().apply(**i);
@@ -128,7 +132,7 @@ void LocationAllocator::allocate_locations(const string &iface)
 		{
 			int blocking = -1;
 			for(unsigned j=0; j<size; ++j)
-				if(used.count(next+j))
+				if(used.count(next+j) || (flat && used_vertex_attribs.count(next+j)))
 					blocking = next+j;
 			if(blocking<0)
 				break;