GRAPHICS: Change how vertex declaration is set

xoreos · Nov 17, 2018 · 0bc1bc5 · 0bc1bc5
1 parent f61bbad
commit 0bc1bc5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/graphics/vertexbuffer.cpp b/src/graphics/vertexbuffer.cpp
@@ -180,6 +180,7 @@ uint32 VertexBuffer::getTypeSize(GLenum type) {
 
 void VertexBuffer::setVertexDeclLinear(uint32 vertCount, VertexDecl &decl) {
 	uint32 vertSize = 0;
+	_decl.clear();
 	for (VertexDecl::iterator a = decl.begin(); a != decl.end(); ++a)
 		vertSize += a->size * getTypeSize(a->type);
 
@@ -191,13 +192,13 @@ void VertexBuffer::setVertexDeclLinear(uint32 vertCount, VertexDecl &decl) {
 		a->pointer = data;
 
 		data += vertCount * a->size * getTypeSize(a->type);
+		_decl.push_back(*a);
 	}
-
-	_decl = decl;
 }
 
 void VertexBuffer::setVertexDeclInterleave(uint32 vertCount, VertexDecl &decl) {
 	uint32 vertSize = 0;
+	_decl.clear();
 	for (VertexDecl::iterator a = decl.begin(); a != decl.end(); ++a)
 		vertSize += a->size * getTypeSize(a->type);
 
@@ -209,9 +210,8 @@ void VertexBuffer::setVertexDeclInterleave(uint32 vertCount, VertexDecl &decl) {
 		a->pointer = _data + offset;
 
 		offset += a->size * getTypeSize(a->type);
+		_decl.push_back(*a);
 	}
-
-	_decl = decl;
 }
 
 GLvoid *VertexBuffer::getData() {