X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuffer.cpp;h=51f4873f76274d2f37305ba8bbc3045eb00406a6;hp=17ae494f72dc37a0892fdf282af33665d8723c49;hb=85c82f93f4874bcf0b04332c9abb62cd2a5b181b;hpb=9addd3d476245415244e59333a36a8fc0eae42bf

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 17ae494f..51f4873f 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -28,18 +28,6 @@ Buffer::~Buffer()
 	glDeleteBuffersARB(1, &id);
 }
 
-void Buffer::bind(BufferType t) const
-{
-	glBindBufferARB(t, id);
-	binding(t) = this;
-}
-
-void Buffer::maybe_bind() const
-{
-	if(binding(type)!=this)
-		bind();
-}
-
 void Buffer::set_usage(BufferUsage u)
 {
 	usage = u;
@@ -47,17 +35,31 @@ void Buffer::set_usage(BufferUsage u)
 
 void Buffer::data(unsigned size, const void *d)
 {
-	maybe_bind();
+	const Buffer *old = current(type);
+	bind();
 	glBufferDataARB(type, size, d, usage);
+	restore(old, type);
 }
 
 void Buffer::sub_data(unsigned offset, unsigned size, const void *d)
 {
-	maybe_bind();
+	const Buffer *old = current(type);
+	bind();
 	glBufferSubDataARB(type, offset, size, d);
+	restore(old, type);
+}
+
+void Buffer::bind_to(BufferType t) const
+{
+	const Buffer *&ptr = binding(t);
+	if(ptr!=this)
+	{
+		glBindBufferARB(t, id);
+		ptr = this;
+	}
 }
 
-void Buffer::unbind(BufferType type)
+void Buffer::unbind_from(BufferType type)
 {
 	const Buffer *&ptr = binding(type);
 	if(ptr)
@@ -79,6 +81,17 @@ const Buffer *&Buffer::binding(BufferType type)
 	}
 }
 
+void Buffer::restore(const Buffer *buf, BufferType type)
+{
+	if(buf!=current(type))
+	{
+		if(buf)
+			buf->bind_to(type);
+		else
+			unbind_from(type);
+	}
+}
+
 const Buffer *Buffer::bound[4] = { 0, 0, 0, 0 };
 
 } // namespace GL