X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.cpp;h=61670cf9d378245f9a96ddead7f0fcea32ffb584;hb=1d24ddbc35f9e0480d30c66d47b7ea3834c15fbf;hp=d8bb28028ee686380e48b77613c039906df40a35;hpb=c233a90fd05f1f5424d7fca94bb6b999f3061271;p=libs%2Fgl.git

diff --git a/source/buffer.cpp b/source/buffer.cpp
index d8bb2802..61670cf9 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -45,19 +45,15 @@ void Buffer::set_usage(BufferUsage u)
 
 void Buffer::data(unsigned sz, const void *d)
 {
-	const Buffer *old = current(type);
-	bind();
+	BindRestore _bind(this, type);
 	glBufferData(type, sz, d, usage);
 	size = sz;
-	restore(old, type);
 }
 
 void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
 {
-	const Buffer *old = current(type);
-	bind();
+	BindRestore _bind(this, type);
 	glBufferSubData(type, off, sz, d);
-	restore(old, type);
 }
 
 BufferRange *Buffer::create_range(unsigned s, unsigned o)
@@ -107,17 +103,6 @@ bool Buffer::set_current(BufferType type, const Buffer *buf)
 	return true;
 }
 
-void Buffer::restore(const Buffer *buf, BufferType type)
-{
-	if(buf!=current(type))
-	{
-		if(buf)
-			buf->bind_to(type);
-		else
-			unbind_from(type);
-	}
-}
-
 
 vector<const BufferRange *> BufferRange::bound_uniform;