Use direct state access for updating VertexSetup

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

diff --git a/source/mesh.h b/source/mesh.h
index 388d4d8806affd4d63901be8b7335a7bc7a85f55..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
@@ -52,10 +53,10 @@ private:
        };
 
        VertexArray vertices;
-       std::list<Batch> batches;
+       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; }
@@ -82,7 +82,7 @@ public:
        float *modify_vertex(unsigned);
 
        void add_batch(const Batch &b);
-       const std::list<Batch> &get_batches() { return batches; }
+       const std::vector<Batch> &get_batches() const { return batches; }
 
        void set_winding(const WindingTest *);
 
@@ -95,7 +95,8 @@ public:
 
        static void unbind();
 
-       virtual Resource::AsyncLoader *load(IO::Seekable &);
+       virtual int get_load_priority() const { return 1; }
+       virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
        virtual UInt64 get_data_size() const;
        virtual void unload();
 };