Remove last fragments of rendererless rendering

[libs/gl.git] / source / mesh.cpp

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 5f9c60d03919e2fe262d4bf848325eaee30dd6e5..4b247e8d4f759aa6f68287590207076ff0dbf5cc 100644 (file)
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,7 +1,6 @@
 #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"
@@ -30,8 +29,6 @@ void Mesh::init(ResourceManager *rm)
 {
        vbuf = 0;
        ibuf = 0;
-       vtx_setup = 0;
-       defer_buffers = ARB_vertex_buffer_object;
        disallow_rendering = false;
        winding = 0;
 
@@ -42,7 +39,6 @@ void Mesh::init(ResourceManager *rm)
 Mesh::~Mesh()
 {
        set_manager(0);
-       delete vtx_setup;
        delete vbuf;
        delete ibuf;
 }
@@ -53,24 +49,10 @@ void Mesh::clear()
        batches.clear();
 }
 
-void Mesh::use_buffers(bool b)
-{
-       defer_buffers = false;
-       if(b)
-               create_buffers();
-       else
-       {
-               vertices.use_buffer(0);
-               delete vbuf;
-               vbuf = 0;
-               delete ibuf;
-               ibuf = 0;
-       }
-}
-
 void Mesh::create_buffers()
 {
-       defer_buffers = false;
+       if(vbuf && ibuf)
+               return;
 
        if(!vbuf)
                vbuf = new Buffer(ARRAY_BUFFER);
@@ -79,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
@@ -99,8 +77,7 @@ float *Mesh::modify_vertex(unsigned i)
 
 void Mesh::add_batch(const Batch &b)
 {
-       if(defer_buffers)
-               create_buffers();
+       create_buffers();
 
        if(!batches.empty() && batches.back().can_append(b.get_type()))
                batches.back().append(b);
@@ -137,28 +114,6 @@ void Mesh::set_winding(const WindingTest *w)
        winding = w;
 }
 
-void Mesh::draw() const
-{
-       const Mesh *cur = current();
-       if(cur && cur!=this)
-               throw invalid_operation("Mesh::draw");
-
-       if(manager)
-       {
-               manager->resource_used(*this);
-               if(disallow_rendering)
-                       return;
-       }
-
-       if(!current())
-               vertices.apply();
-       BindRestore bind_ibuf(ibuf, ELEMENT_ARRAY_BUFFER);
-       Bind bind_winding(winding);
-
-       for(vector<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
-               i->draw();
-}
-
 void Mesh::draw(Renderer &renderer) const
 {
        if(manager)
@@ -196,16 +151,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)
+       if(set_current(this))
        {
-               unbind();
-               vertices.apply(false);
-       }
-       else if(set_current(this))
-       {
-               vtx_setup->bind();
+               vtx_setup.bind();
                vertices.refresh();
        }
 }
@@ -238,7 +186,6 @@ void Mesh::unload()
        batches.clear();
        delete vbuf;
        delete ibuf;
-       defer_buffers = (vbuf || ibuf);
        vbuf = 0;
        ibuf = 0;
 }
@@ -261,9 +208,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);
 }
 
@@ -290,12 +237,8 @@ Mesh::AsyncLoader::AsyncLoader(Mesh &m, IO::Seekable &i):
        index_updater(0),
        phase(0)
 {
-       // Make sure the extension is initialized in the rendering thread.
-       (void)(bool)NV_primitive_restart;
-
        mesh.disallow_rendering = true;
-       if(mesh.defer_buffers)
-               mesh.create_buffers();
+       mesh.create_buffers();
 }
 
 Mesh::AsyncLoader::~AsyncLoader()