X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.cpp;h=9edcf07d6e52ab52e2b9b5f277a0f57b389fcec3;hb=20703b6d4dfd0836cdb787bd416d4ae9bf010602;hp=d8bb28028ee686380e48b77613c039906df40a35;hpb=c233a90fd05f1f5424d7fca94bb6b999f3061271;p=libs%2Fgl.git

diff --git a/source/buffer.cpp b/source/buffer.cpp
index d8bb2802..9edcf07d 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)
@@ -65,17 +61,42 @@ BufferRange *Buffer::create_range(unsigned s, unsigned o)
 	return new BufferRange(*this, s, o);
 }
 
+void *Buffer::map(BufferAccess access)
+{
+	BindRestore _bind(this, type);
+	return glMapBuffer(type, access);
+}
+
+bool Buffer::unmap()
+{
+	BindRestore _bind(this, type);
+	return glUnmapBuffer(type);
+}
+
 void Buffer::bind_to(BufferType t) const
 {
 	if(t!=type)
 		require_buffer_type(t);
-	// Don't change the binding in a mesh's vertex array object
-	if(t==ELEMENT_ARRAY_BUFFER && Mesh::current())
-		throw invalid_operation("Buffer::bind_to(ELEMENT_ARRAY_BUFFER)");
+	if(t==ELEMENT_ARRAY_BUFFER)
+		if(const Mesh *m = Mesh::current())
+		{
+			// Don't change the binding in a mesh's vertex array object
+			if(this==m->get_index_buffer())
+				return;
+			throw invalid_operation("Buffer::bind_to(ELEMENT_ARRAY_BUFFER)");
+		}
 	if(set_current(t, this))
 		glBindBuffer(t, id);
 }
 
+const Buffer *Buffer::current(BufferType t)
+{
+	if(t==ELEMENT_ARRAY_BUFFER)
+		if(const Mesh *m = Mesh::current())
+			return m->get_index_buffer();
+	return binding(t);
+}
+
 void Buffer::unbind_from(BufferType type)
 {
 	if(type==ELEMENT_ARRAY_BUFFER && Mesh::current())
@@ -107,17 +128,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;