Move vertex array object management out of Mesh

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

diff --git a/source/mesh.h b/source/mesh.h
index 70370633fd0425cf88222ceab22b40d012604a35..db0163e17ef3521ef471109758b9d846c6649782 100644 (file)
--- a/source/mesh.h
+++ b/source/mesh.h
@@ -12,6 +12,7 @@ namespace GL {
 
 class Buffer;
 class Renderer;
+class VertexSetup;
 
 /**
 Raw mesh data, consisting of a VertexArray and one or more Batches.  Though a
@@ -55,7 +56,7 @@ private:
        std::vector<Batch> batches;
        Buffer *vbuf;
        Buffer *ibuf;
-       unsigned vao_id;
+       VertexSetup *vtx_setup;
        bool defer_buffers;
        mutable bool dirty;
        bool disallow_rendering;
@@ -73,7 +74,6 @@ public:
        void use_buffers(bool);
 private:
        void create_buffers();
-       void setup_vao() const;
 
 public:
        const VertexArray &get_vertices() const { return vertices; }