X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fmesh.cpp;h=f63b32933c64245f988004df8fbca9377d62541c;hb=bf6890e18cd497bc2abfdb7c4c42378059422c9e;hp=dba8a9915489aede7906f8a684b9d59e288428b5;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/mesh.cpp b/source/core/mesh.cpp
index dba8a991..f63b3293 100644
--- a/source/core/mesh.cpp
+++ b/source/core/mesh.cpp
@@ -1,6 +1,7 @@
 #include <msp/gl/extensions/arb_vertex_array_object.h>
 #include <msp/gl/extensions/arb_vertex_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
+#include <msp/gl/extensions/khr_debug.h>
 #include "buffer.h"
 #include "error.h"
 #include "mesh.h"
@@ -63,6 +64,11 @@ void Mesh::check_buffers(unsigned mask)
 			vertices.use_buffer(vbuf);
 			vtx_setup.set_vertex_array(vertices);
 			dirty |= VERTEX_BUFFER;
+
+#ifdef DEBUG
+			if(!debug_name.empty())
+				vbuf->set_debug_name(debug_name+" [VBO]");
+#endif
 		}
 	}
 
@@ -77,6 +83,11 @@ void Mesh::check_buffers(unsigned mask)
 				batches.front().change_buffer(ibuf);
 			vtx_setup.set_index_buffer(*ibuf);
 			dirty |= INDEX_BUFFER;
+
+#ifdef DEBUG
+			if(!debug_name.empty())
+				vbuf->set_debug_name(debug_name+" [IBO]");
+#endif
 		}
 	}
 }
@@ -155,6 +166,9 @@ void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const
 			return;
 	}
 
+	if(batches.empty())
+		return;
+
 	if(dirty)
 		resize_buffers();
 
@@ -177,7 +191,7 @@ void Mesh::resize_buffers() const
 {
 	if(dirty&VERTEX_BUFFER)
 		vbuf->storage(vertices.get_required_buffer_size());
-	if(dirty&INDEX_BUFFER)
+	if((dirty&INDEX_BUFFER) && !batches.empty())
 		ibuf->storage(batches.front().get_required_buffer_size());
 	dirty = 0;
 }
@@ -202,12 +216,27 @@ void Mesh::unload()
 	vertices.clear();
 	vertices.use_buffer(0);
 	batches.clear();
+	vtx_setup.unload();
 	delete vbuf;
 	delete ibuf;
 	vbuf = 0;
 	ibuf = 0;
 }
 
+void Mesh::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	debug_name = name;
+	if(vbuf)
+		vbuf->set_debug_name(name+" [VBO]");
+	if(ibuf)
+		ibuf->set_debug_name(name+" [IBO]");
+	vtx_setup.set_debug_name(name+" [VAO]");
+#else
+	(void)name;
+#endif
+}
+
 
 Mesh::Loader::Loader(Mesh &m, bool g):
 	DataFile::ObjectLoader<Mesh>(m),
@@ -218,13 +247,13 @@ Mesh::Loader::Loader(Mesh &m, bool g):
 	add("winding",  &Loader::winding);
 }
 
-void Mesh::Loader::vertices(const vector<VertexComponent> &c)
+void Mesh::Loader::vertices(const vector<VertexAttribute> &a)
 {
-	if(c.empty())
-		throw invalid_argument("No vertex components");
+	if(a.empty())
+		throw invalid_argument("No vertex attributes");
 
 	VertexFormat fmt;
-	for(vector<VertexComponent>::const_iterator i=c.begin(); i!=c.end(); ++i)
+	for(vector<VertexAttribute>::const_iterator i=a.begin(); i!=a.end(); ++i)
 		fmt = (fmt, *i);
 	obj.vertices.reset(fmt);
 	load_sub(obj.vertices);