Restore old buffer binding when setting data

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index c7609afe6ae419445e777e032975fdcb61f8a3ad..079c2234cc5a598ac5abdb21925aa55c00ca8123 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -51,8 +51,11 @@ private:
        VertexFormat format;
        std::vector<float> data;
        unsigned stride;
-       Buffer *vbuf;
-       bool own_vbuf;
+       RefPtr<Buffer> vbuf;
+       bool defer_vbuf;
+       mutable bool dirty;
+
+       static ArrayMask enabled_arrays;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
@@ -69,13 +72,13 @@ public:
        void         clear();
        void         reset(const VertexFormat &);
        void         apply() const;
-       void         update_data();
        float        *append();
-       float        *operator[](unsigned i) { return &data[0]+i*stride; }
+       float *modify(unsigned);
+       float *operator[](unsigned i) { return modify(i); }
        const float  *operator[](unsigned i) const { return &data[0]+i*stride; }
 
 private:
-       static ArrayMask enabled_arrays;
+       void set_dirty();
 };
 
 void array_element(int);