X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.cpp;h=c19f3727f8f5c685a2ab5abc761a0293c3aa7c85;hb=196093790e242dec24bfbbf7ad8c28dcc442824c;hp=fbb1e159ee564df8b2d7816e459adda6312cfc20;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/buffer.cpp b/source/buffer.cpp
index fbb1e159..c19f3727 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -8,9 +8,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+const Buffer *Buffer::bound[4] = { 0, 0, 0, 0 };
+
 Buffer::Buffer(BufferType t):
 	type(t),
-	usage(STATIC_DRAW)
+	usage(STATIC_DRAW),
+	size(0)
 {
 	static RequireExtension _req_vbo("GL_ARB_vertex_buffer_object");
 	if(type==PIXEL_PACK_BUFFER || type==PIXEL_UNPACK_BUFFER)
@@ -29,19 +32,20 @@ void Buffer::set_usage(BufferUsage u)
 	usage = u;
 }
 
-void Buffer::data(unsigned size, const void *d)
+void Buffer::data(unsigned sz, const void *d)
 {
 	const Buffer *old = current(type);
 	bind();
-	glBufferDataARB(type, size, d, usage);
+	glBufferDataARB(type, sz, d, usage);
+	size = sz;
 	restore(old, type);
 }
 
-void Buffer::sub_data(unsigned offset, unsigned size, const void *d)
+void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
 {
 	const Buffer *old = current(type);
 	bind();
-	glBufferSubDataARB(type, offset, size, d);
+	glBufferSubDataARB(type, off, sz, d);
 	restore(old, type);
 }
 
@@ -88,7 +92,5 @@ void Buffer::restore(const Buffer *buf, BufferType type)
 	}
 }
 
-const Buffer *Buffer::bound[4] = { 0, 0, 0, 0 };
-
 } // namespace GL
 } // namespace Msp