Restore old buffer binding when setting data

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 281996d457da92894c6a4eb58111564c81c0ef43..079c2234cc5a598ac5abdb21925aa55c00ca8123 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -1,18 +1,19 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
 #ifndef MSP_GL_VERTEXARRAY_H_
 #define MSP_GL_VERTEXARRAY_H_
 
+#include <climits>
 #include <vector>
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
+#include "datatype.h"
 #include "primitivetype.h"
-#include "types.h"
 #include "vertexarraybuilder.h"
 #include "vertexformat.h"
 
@@ -31,11 +32,30 @@ public:
        };
 
 private:
+       struct ArrayMask
+       {
+               enum
+               {
+                       B = (sizeof(unsigned)*CHAR_BIT),
+                       N = (63+B)/B
+               };
+
+               unsigned mask[N];
+
+               ArrayMask();
+
+               void set(unsigned);
+               bool is_set(unsigned) const;
+       };
+
        VertexFormat format;
        std::vector<float> data;
-       uint         stride;
-       Buffer       *vbuf;
-       bool         own_vbuf;
+       unsigned stride;
+       RefPtr<Buffer> vbuf;
+       bool defer_vbuf;
+       mutable bool dirty;
+
+       static ArrayMask enabled_arrays;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
@@ -52,31 +72,30 @@ 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:
-       void set_array(unsigned, bool, unsigned) const;
 
-       static unsigned enabled_arrays;
+private:
+       void set_dirty();
 };
 
 void array_element(int);
-void draw_arrays(PrimitiveType, int, sizei);
-void draw_elements(PrimitiveType, sizei, DataType, const void *);
-void draw_range_elements(PrimitiveType, uint, uint, sizei, DataType, const void *);
+void draw_arrays(PrimitiveType, int, unsigned);
+void draw_elements(PrimitiveType, unsigned, DataType, const void *);
+void draw_range_elements(PrimitiveType, unsigned, unsigned, unsigned, DataType, const void *);
 
-inline void draw_elements(PrimitiveType mode, sizei count, const unsigned *indices)
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices)
 { draw_elements(mode, count, UNSIGNED_INT, indices); }
 
-inline void draw_elements(PrimitiveType mode, sizei count, const unsigned short *indices)
+inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices)
 { draw_elements(mode, count, UNSIGNED_SHORT, indices); }
 
-inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, const unsigned short *indices)
+inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned short *indices)
 { draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); }
 
-inline void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, const unsigned *indices)
+inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned *indices)
 { draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); }
 
 } // namespace GL