X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.cpp;h=080c3fb380dc6dbf605e3a843b5ffb1e9a2851ba;hb=346ed5bd91f10489acd280e2165a951d6938f0df;hp=9fa03c1242024184585618ff841b71d802fc1a46;hpb=8b99547d099c96bd8cc6037e2026db123b2523c1;p=libs%2Fgl.git

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 9fa03c12..080c3fb3 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,7 +1,5 @@
 #include <stdexcept>
-#include <msp/gl/extensions/arb_pixel_buffer_object.h>
-#include <msp/gl/extensions/arb_uniform_buffer_object.h>
-#include <msp/gl/extensions/arb_vertex_buffer_object.h>
+#include <msp/gl/extensions/arb_map_buffer_range.h>
 #include "buffer.h"
 #include "error.h"
 #include "mesh.h"
@@ -13,6 +11,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),
@@ -26,6 +25,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);
 }
 
@@ -61,6 +63,33 @@ BufferRange *Buffer::create_range(unsigned s, unsigned o)
 	return new BufferRange(*this, s, o);
 }
 
+void *Buffer::map(BufferAccess access)
+{
+	if(ARB_map_buffer_range)
+	{
+		BindRestore _bind(this, type);
+		GLenum access_bits = 0;
+		if(access==READ_ONLY)
+			access_bits = GL_MAP_READ_BIT;
+		else if(access==WRITE_ONLY)
+			access_bits = GL_MAP_WRITE_BIT;
+		else if(access==READ_WRITE)
+			access_bits = GL_MAP_READ_BIT|GL_MAP_WRITE_BIT;
+		return glMapBufferRange(type, 0, size, access_bits);
+	}
+	else
+	{
+		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)
@@ -128,6 +157,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);
@@ -137,9 +173,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)