X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.h;h=af1817b18461893591bc72c001db80c1dd72c0ce;hb=8aea0f65f9ab7d603e47cf4479388af246cc8400;hp=1887ad912d52547d89257e48f74af7d10e58db47;hpb=ab59f5a9e66b3fc7872ad96ec7949940189f0819;p=libs%2Fgl.git

diff --git a/source/vertexarray.h b/source/vertexarray.h
index 1887ad91..af1817b1 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -38,8 +38,7 @@ private:
 	std::vector<float> data;
 	unsigned stride;
 	std::vector<Array> arrays;
-	RefPtr<Buffer> vbuf;
-	bool defer_vbuf;
+	Buffer *vbuf;
 	mutable bool dirty;
 
 	VertexArray(const VertexArray &);
@@ -54,7 +53,6 @@ private:
 	static unsigned get_array_slot(unsigned char);
 
 public:
-	void use_vertex_buffer();
 	void use_vertex_buffer(Buffer *);
 
 	void clear();
@@ -70,6 +68,8 @@ public:
 	const float *operator[](unsigned i) const { return &data[0]+i*stride; }
 
 	void apply() const;
+private:
+	static void apply_arrays(const std::vector<Array> *, const std::vector<Array> *, const float *, unsigned);
 };
 
 } // namespace GL