X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmesh.cpp;fp=source%2Fmesh.cpp;h=e901536535cd04716d973594200700cb8829807a;hb=e65e7dabfc1d3b2c87345df75fc942fb1fe47581;hp=746b07d8e1db7d6ac29f2cd9d75eeae0c60496f6;hpb=17fa4c91e46a40e7cd614d51ff5950039c586581;p=libs%2Fgl.git

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 746b07d8..e9015365 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -29,7 +29,6 @@ void Mesh::init(ResourceManager *rm)
 {
 	vbuf = 0;
 	ibuf = 0;
-	vtx_setup = 0;
 	disallow_rendering = false;
 	winding = 0;
 
@@ -40,7 +39,6 @@ void Mesh::init(ResourceManager *rm)
 Mesh::~Mesh()
 {
 	set_manager(0);
-	delete vtx_setup;
 	delete vbuf;
 	delete ibuf;
 }
@@ -53,6 +51,9 @@ void Mesh::clear()
 
 void Mesh::create_buffers()
 {
+	if(vbuf && ibuf)
+		return;
+
 	if(!vbuf)
 		vbuf = new Buffer(ARRAY_BUFFER);
 	vertices.use_buffer(vbuf);
@@ -60,12 +61,8 @@ void Mesh::create_buffers()
 	if(!ibuf)
 		ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
 
-	if(ARB_vertex_array_object && !vtx_setup)
-	{
-		vtx_setup = new VertexSetup;
-		vtx_setup->set_vertex_array(vertices);
-		vtx_setup->set_index_buffer(*ibuf);
-	}
+	vtx_setup.set_vertex_array(vertices);
+	vtx_setup.set_index_buffer(*ibuf);
 }
 
 unsigned Mesh::get_n_vertices() const
@@ -130,8 +127,7 @@ void Mesh::draw() const
 			return;
 	}
 
-	if(!current())
-		vertices.apply();
+	BindRestore bind_vtxs(vtx_setup);
 	BindRestore bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
 	Bind bind_winding(winding);
 
@@ -176,16 +172,9 @@ void Mesh::draw_instanced(Renderer &renderer, const VertexSetup &vs, unsigned co
 
 void Mesh::bind() const
 {
-	/* If VAOs are not supported, vtx_setup is zero and set_current won't get
-	called.  Thus unbind won't try to call a null function either. */
-	if(!vtx_setup)
-	{
-		unbind();
-		vertices.apply();
-	}
-	else if(set_current(this))
+	if(set_current(this))
 	{
-		vtx_setup->bind();
+		vtx_setup.bind();
 		vertices.refresh();
 	}
 }
@@ -240,9 +229,9 @@ 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);
-	if(obj.vtx_setup)
+	if(obj.vbuf)
 		// Set it again to force the vertex setup to update
-		obj.vtx_setup->set_vertex_array(obj.vertices);
+		obj.vtx_setup.set_vertex_array(obj.vertices);
 	load_sub(obj.vertices);
 }