X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.cpp;h=1226dbe3223f41e438ddcc7ca1c2f9b107b0fd17;hb=57de40e1e802e44ae5b4caa67b0bb8763828b5c3;hp=84c72716d0e5da16cebb42fcd8e191c093ae1bd3;hpb=6afbace895a7bbcf216ab8e48280ea0303ab5892;p=libs%2Fgl.git

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 84c72716..1226dbe3 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,8 +1,7 @@
 #include <stdexcept>
-#include "arb_pixel_buffer_object.h"
-#include "arb_uniform_buffer_object.h"
-#include "arb_vertex_buffer_object.h"
 #include "buffer.h"
+#include "error.h"
+#include "mesh.h"
 #include "misc.h"
 
 using namespace std;
@@ -11,6 +10,7 @@ namespace Msp {
 namespace GL {
 
 const Buffer *Buffer::bound[5] = { 0, 0, 0, 0, 0 };
+BufferType buffer_types[] = { ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, PIXEL_PACK_BUFFER, PIXEL_UNPACK_BUFFER, UNIFORM_BUFFER };
 
 Buffer::Buffer(BufferType t):
 	type(t),
@@ -24,6 +24,9 @@ Buffer::Buffer(BufferType t):
 
 Buffer::~Buffer()
 {
+	for(unsigned i=0; i<5; ++i)
+		if(bound[i]==this)
+			unbind_from(buffer_types[i]);
 	glDeleteBuffers(1, &id);
 }
 
@@ -43,19 +46,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)
@@ -63,16 +62,46 @@ 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);
+	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())
+		throw invalid_operation("Buffer::unbind_from(ELEMENT_ARRAY_BUFFER)");
 	if(set_current(type, 0))
 		glBindBuffer(type, 0);
 }
@@ -100,17 +129,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;
 
@@ -123,6 +141,13 @@ BufferRange::BufferRange(Buffer &b, unsigned o, unsigned s):
 		throw out_of_range("BufferRange::BufferRange");
 }
 
+BufferRange::~BufferRange()
+{
+	for(unsigned i=0; i<bound_uniform.size(); ++i)
+		if(bound_uniform[i]==this)
+			unbind_from(UNIFORM_BUFFER, i);
+}
+
 void BufferRange::data(const void *d)
 {
 	buffer.sub_data(offset, size, d);
@@ -132,9 +157,12 @@ void BufferRange::bind_to(BufferType t, unsigned i)
 {
 	if(t!=buffer.type)
 		Buffer::require_buffer_type(t);
-	// Intentionally using bitwise | to avoid short-circuiting
-	if(Buffer::set_current(t, &buffer) | set_current(t, i, this))
+	if(set_current(t, i, this))
+	{
+		// The buffer gets bound as a side effect
+		Buffer::set_current(t, &buffer);
 		glBindBufferRange(t, i, buffer.id, offset, size);
+	}
 }
 
 void BufferRange::unbind_from(BufferType t, unsigned i)
@@ -151,13 +179,13 @@ const BufferRange *&BufferRange::binding(BufferType type, unsigned index)
 	if(type==UNIFORM_BUFFER)
 	{
 		if(index>=get_n_uniform_buffer_bindings())
-			throw out_of_range("Buffer::binding");
+			throw out_of_range("BufferRange::binding");
 		if(bound_uniform.size()<=index)
 			bound_uniform.resize(index+1);
 		return bound_uniform[index];
 	}
 	else
-		throw invalid_argument("Buffer::binding");
+		throw invalid_argument("BufferRange::binding");
 }
 
 bool BufferRange::set_current(BufferType type, unsigned index, const BufferRange *buf)