X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.cpp;h=dba8a9915489aede7906f8a684b9d59e288428b5;hp=869ea671faeed0493ca4109dce4d27cddd1647e2;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=d6ec375442b31d052b9fcb013508ad7523749147

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 869ea671..dba8a991 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,11 +1,12 @@
 #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/nv_primitive_restart.h>
 #include "buffer.h"
 #include "error.h"
 #include "mesh.h"
 #include "renderer.h"
 #include "resourcemanager.h"
+#include "vertexsetup.h"
 
 using namespace std;
 
@@ -28,9 +29,8 @@ void Mesh::init(ResourceManager *rm)
 {
 	vbuf = 0;
 	ibuf = 0;
-	vao_id = 0;
-	defer_buffers = true;
-	dirty = true;
+	dirty = 0;
+	disallow_rendering = false;
 	winding = 0;
 
 	if(rm)
@@ -39,10 +39,10 @@ void Mesh::init(ResourceManager *rm)
 
 Mesh::~Mesh()
 {
+	set_manager(0);
+	batches.clear();
 	delete vbuf;
 	delete ibuf;
-	if(vao_id)
-		glDeleteVertexArrays(1, &vao_id);
 }
 
 void Mesh::clear()
@@ -51,59 +51,34 @@ void Mesh::clear()
 	batches.clear();
 }
 
-void Mesh::use_buffers(bool b)
+void Mesh::check_buffers(unsigned mask)
 {
-	defer_buffers = false;
-	if(b)
-		create_buffers();
-	else
+	if(mask&VERTEX_BUFFER)
 	{
-		vertices.use_buffer(0);
-		delete vbuf;
-		vbuf = 0;
-		delete ibuf;
-		ibuf = 0;
+		unsigned req_size = vertices.get_required_buffer_size();
+		if(!vbuf || (vbuf->get_size()>0 && vbuf->get_size()<req_size))
+		{
+			delete vbuf;
+			vbuf = new Buffer(ARRAY_BUFFER);
+			vertices.use_buffer(vbuf);
+			vtx_setup.set_vertex_array(vertices);
+			dirty |= VERTEX_BUFFER;
+		}
 	}
-}
-
-void Mesh::create_buffers()
-{
-	defer_buffers = false;
-
-	if(!vbuf)
-		vbuf = new Buffer(ARRAY_BUFFER);
-	vertices.use_buffer(vbuf);
-
-	if(!ibuf)
-		ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
-
-	if(ARB_vertex_array_object && !vao_id)
-		glGenVertexArrays(1, &vao_id);
-}
-
-void Mesh::setup_vao() const
-{
-	Bind bind_vbuf(vbuf, ARRAY_BUFFER);
 
-	const VertexFormat &fmt = vertices.get_format();
-	unsigned stride = get_stride(fmt)*sizeof(float);
-	float *ptr = 0;
-	for(const unsigned char *c=fmt.begin(); c!=fmt.end(); ++c)
+	if(mask&INDEX_BUFFER)
 	{
-		unsigned t = get_component_type(*c);
-		if(t>=get_component_type(ATTRIB1))
-			t -= get_component_type(ATTRIB1);
-		unsigned sz = get_component_size(*c);
-		if(*c==COLOR4_UBYTE)
-			glVertexAttribPointer(t, 4, GL_UNSIGNED_BYTE, true, stride, ptr);
-		else
-			glVertexAttribPointer(t, sz, GL_FLOAT, false, stride, ptr);
-		glEnableVertexAttribArray(t);
-		ptr += sz;
+		unsigned req_size = (batches.empty() ? 0 : batches.front().get_required_buffer_size());
+		if(!ibuf || (ibuf->get_size()>0 && ibuf->get_size()<req_size))
+		{
+			delete ibuf;
+			ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
+			if(!batches.empty())
+				batches.front().change_buffer(ibuf);
+			vtx_setup.set_index_buffer(*ibuf);
+			dirty |= INDEX_BUFFER;
+		}
 	}
-	glBindBuffer(ELEMENT_ARRAY_BUFFER, ibuf->get_id());
-
-	dirty = false;
 }
 
 unsigned Mesh::get_n_vertices() const
@@ -118,18 +93,39 @@ float *Mesh::modify_vertex(unsigned i)
 
 void Mesh::add_batch(const Batch &b)
 {
-	if(defer_buffers)
-		create_buffers();
-
-	if(!batches.empty() && batches.back().can_append(b.get_type()))
+	if(batches.empty())
+	{
+		batches.push_back(b);
+		if(ibuf)
+			batches.back().use_buffer(ibuf);
+	}
+	else if(batches.back().can_append(b.get_type()))
 		batches.back().append(b);
 	else
 	{
-		Batch *prev = (batches.empty() ? 0 : &batches.back());
+		bool reallocate = (batches.size()==batches.capacity());
+		if(reallocate)
+		{
+			for(vector<Batch>::iterator i=batches.end(); i!=batches.begin(); )
+				(--i)->use_buffer(0);
+		}
+
+		Batch *prev = &batches.back();
 		batches.push_back(b);
-		if(ibuf)
+		if(reallocate)
+		{
+			prev = 0;
+			for(vector<Batch>::iterator i=batches.begin(); i!=batches.end(); ++i)
+			{
+				i->use_buffer(ibuf, prev);
+				prev = &*i;
+			}
+		}
+		else
 			batches.back().use_buffer(ibuf, prev);
 	}
+
+	check_buffers(INDEX_BUFFER);
 }
 
 void Mesh::set_winding(const WindingTest *w)
@@ -137,29 +133,20 @@ void Mesh::set_winding(const WindingTest *w)
 	winding = w;
 }
 
-void Mesh::draw() const
+void Mesh::draw(Renderer &renderer) const
 {
-	const Mesh *cur = current();
-	if(cur && cur!=this)
-		throw invalid_operation("Mesh::draw");
-
-	if(manager)
-	{
-		manager->resource_used(*this);
-		if(disallow_rendering)
-			return;
-	}
+	draw(renderer, 0, 0);
+}
 
-	if(!current())
-		vertices.apply();
-	Bind bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-	Bind bind_winding(winding);
+void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned count) const
+{
+	if(vs.get_vertex_array()!=&vertices)
+		throw invalid_argument("Mesh::draw_instanced");
 
-	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		i->draw();
+	draw(renderer, &vs, count);
 }
 
-void Mesh::draw(Renderer &renderer) const
+void Mesh::draw(Renderer &renderer, const VertexSetup *vs, unsigned count) const
 {
 	if(manager)
 	{
@@ -168,39 +155,34 @@ void Mesh::draw(Renderer &renderer) const
 			return;
 	}
 
-	renderer.set_mesh(this);
-	renderer.set_element_buffer(ibuf);
-	renderer.set_winding_test(winding);
+	if(dirty)
+		resize_buffers();
 
-	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-		renderer.draw(*i);
-}
+	renderer.set_vertex_setup(vs ? vs : &vtx_setup);
+	renderer.set_winding_test(winding);
 
-void Mesh::bind() const
-{
-	/* If VAOs are not supported, vao_id is zero and set_current won't get
-	called.  Thus unbind won't try to call a null function either. */
-	if(!vao_id)
+	if(!count)
 	{
-		unbind();
-		vertices.apply(false);
+		for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+			renderer.draw(*i);
 	}
-	else if(set_current(this))
+	else
 	{
-		glBindVertexArray(vao_id);
-		vertices.refresh();
-		if(dirty)
-			setup_vao();
+		for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
+			renderer.draw_instanced(*i, count);
 	}
 }
 
-void Mesh::unbind()
+void Mesh::resize_buffers() const
 {
-	if(set_current(0))
-		glBindVertexArray(0);
+	if(dirty&VERTEX_BUFFER)
+		vbuf->storage(vertices.get_required_buffer_size());
+	if(dirty&INDEX_BUFFER)
+		ibuf->storage(batches.front().get_required_buffer_size());
+	dirty = 0;
 }
 
-Resource::AsyncLoader *Mesh::load(IO::Seekable &io)
+Resource::AsyncLoader *Mesh::load(IO::Seekable &io, const Resources *)
 {
 	return new AsyncLoader(*this, io);
 }
@@ -222,14 +204,14 @@ void Mesh::unload()
 	batches.clear();
 	delete vbuf;
 	delete ibuf;
-	defer_buffers = (vbuf || ibuf);
 	vbuf = 0;
 	ibuf = 0;
 }
 
 
-Mesh::Loader::Loader(Mesh &m):
-	DataFile::ObjectLoader<Mesh>(m)
+Mesh::Loader::Loader(Mesh &m, bool g):
+	DataFile::ObjectLoader<Mesh>(m),
+	allow_gl_calls(g)
 {
 	add("batch",    &Loader::batch);
 	add("vertices", &Loader::vertices);
@@ -245,8 +227,12 @@ void Mesh::Loader::vertices(const vector<VertexComponent> &c)
 	for(vector<VertexComponent>::const_iterator i=c.begin(); i!=c.end(); ++i)
 		fmt = (fmt, *i);
 	obj.vertices.reset(fmt);
-	obj.dirty = true;
 	load_sub(obj.vertices);
+	if(allow_gl_calls)
+	{
+		obj.check_buffers(VERTEX_BUFFER);
+		obj.vtx_setup.refresh();
+	}
 }
 
 void Mesh::Loader::batch(PrimitiveType p)
@@ -272,12 +258,8 @@ Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i):
 	index_updater(0),
 	phase(0)
 {
-	// Make sure the extension is initialized in the rendering thread.
-	(bool)NV_primitive_restart;
-
 	mesh.disallow_rendering = true;
-	if(mesh.defer_buffers)
-		mesh.create_buffers();
+	mesh.check_buffers(VERTEX_BUFFER|INDEX_BUFFER);
 }
 
 Mesh::AsyncLoader::~AsyncLoader()
@@ -298,11 +280,13 @@ bool Mesh::AsyncLoader::process()
 	{
 		// TODO use correct filename
 		DataFile::Parser parser(io, "async");
-		Loader loader(mesh);
+		Loader loader(mesh, false);
 		loader.load(parser);
 	}
 	else if(phase==1)
 	{
+		mesh.resize_buffers();
+		mesh.vtx_setup.refresh();
 		vertex_updater = mesh.vertices.refresh_async();
 		if(!mesh.batches.empty())
 			index_updater = mesh.batches.front().refresh_async();