Allow applying a VertexArray in non-legacy mode

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

diff --git a/source/vertexarray.h b/source/vertexarray.h
index e38f0afff910b20500b750983fcf957db934d741..d6dee7dd59ce3a9f3c81185aed2a405fa571277a 100644 (file)
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -39,6 +39,9 @@ private:
        std::vector<float> data;
        unsigned stride;
        std::vector<Array> arrays;
+       bool legacy;
+
+       static bool legacy_used;
 
        VertexArray(const VertexArray &);
        VertexArray &operator=(const VertexArray &);
@@ -61,16 +64,19 @@ public:
        float *modify(unsigned);
 private:
        virtual unsigned get_data_size() const;
-       virtual void upload_data() const;
+       virtual const void *get_data_pointer() const { return &data[0]; }
 
 public:
        unsigned size() const { return data.size()/stride; }
        const std::vector<float> &get_data() const { return data; }
        const float *operator[](unsigned i) const { return &data[0]+i*stride; }
 
-       void apply() const;
+       void bind() const { apply(); }
+       void apply(bool = true) const;
 private:
-       static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
+       static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned, bool);
+public:
+       static void unbind();
 };
 
 } // namespace GL