X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fvertexsetup.cpp;h=2994916e81e0503c29110d55882f60cccf258ea1;hb=e1be82a4dfce8d90358c506f65be09da4dc9d5ec;hp=50f9c1837d1eff8e6bf5bfdf89d956b2cec82827;hpb=39495091719dfc699b6454f6b23925b03544da9a;p=libs%2Fgl.git

diff --git a/source/core/vertexsetup.cpp b/source/core/vertexsetup.cpp
index 50f9c183..2994916e 100644
--- a/source/core/vertexsetup.cpp
+++ b/source/core/vertexsetup.cpp
@@ -1,4 +1,4 @@
-#include "deviceinfo.h"
+#include "device.h"
 #include "error.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
@@ -72,8 +72,8 @@ bool VertexSetup::verify_format(const VertexFormat &fmt)
 	if(fmt.empty())
 		return false;
 
-	static unsigned max_attribs = DeviceInfo::get_global().limits.max_vertex_attributes;
-	return all_of(fmt.begin(), fmt.end(), [](VertexAttribute a){ return get_attribute_semantic(a)<max_attribs; });
+	static unsigned max_attribs = Device::get_current().get_info().limits.max_vertex_attributes;
+	return all_of(fmt.begin(), fmt.end(), [](VertexAttribute a){ return is_padding(a) || get_attribute_semantic(a)<max_attribs; });
 }
 
 void VertexSetup::update() const