X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.cpp;h=35975f1712ed2973c10a926d55812a9efb1c2f3c;hb=ffe1debbd757d20f7250fd8572c2c46cd901f559;hp=9edcf07d6e52ab52e2b9b5f277a0f57b389fcec3;hpb=92351f63c5061d2b0b96201390649662c2833388;p=libs%2Fgl.git

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 9edcf07d..35975f17 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,11 +1,11 @@
 #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_direct_state_access.h>
+#include <msp/gl/extensions/arb_map_buffer_range.h>
+#include <msp/strings/format.h>
 #include "buffer.h"
 #include "error.h"
-#include "mesh.h"
 #include "misc.h"
+#include "vertexsetup.h"
 
 using namespace std;
 
@@ -13,6 +13,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),
@@ -21,11 +22,17 @@ Buffer::Buffer(BufferType t):
 {
 	require_buffer_type(type);
 
-	glGenBuffers(1, &id);
+	if(ARB_direct_state_access)
+		glCreateBuffers(1, &id);
+	else
+		glGenBuffers(1, &id);
 }
 
 Buffer::~Buffer()
 {
+	for(unsigned i=0; i<5; ++i)
+		if(bound[i]==this)
+			unbind_from(buffer_types[i]);
 	glDeleteBuffers(1, &id);
 }
 
@@ -40,20 +47,37 @@ void Buffer::require_buffer_type(BufferType type)
 
 void Buffer::set_usage(BufferUsage u)
 {
+	// TODO OpenGL ES 2.0 doesn't support read or copy usages
 	usage = u;
 }
 
 void Buffer::data(unsigned sz, const void *d)
 {
-	BindRestore _bind(this, type);
-	glBufferData(type, sz, d, usage);
+	if(ARB_direct_state_access)
+		glNamedBufferData(id, sz, d, usage);
+	else
+	{
+		BindRestore _bind(this, type);
+		glBufferData(type, sz, d, usage);
+	}
 	size = sz;
 }
 
 void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
 {
-	BindRestore _bind(this, type);
-	glBufferSubData(type, off, sz, d);
+	if(ARB_direct_state_access)
+		glNamedBufferSubData(id, off, sz, d);
+	else
+	{
+		BindRestore _bind(this, type);
+		glBufferSubData(type, off, sz, d);
+	}
+}
+
+void Buffer::require_size(unsigned req_sz) const
+{
+	if(size<req_sz)
+		throw buffer_too_small(format("buffer has %d bytes; %d required", size, req_sz));
 }
 
 BufferRange *Buffer::create_range(unsigned s, unsigned o)
@@ -61,16 +85,41 @@ BufferRange *Buffer::create_range(unsigned s, unsigned o)
 	return new BufferRange(*this, s, o);
 }
 
-void *Buffer::map(BufferAccess access)
+void *Buffer::map()
 {
-	BindRestore _bind(this, type);
-	return glMapBuffer(type, access);
+	if(ARB_map_buffer_range)
+	{
+		if(ARB_direct_state_access)
+			return glMapNamedBufferRange(id, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
+		else
+		{
+			BindRestore _bind(this, type);
+			return glMapBufferRange(type, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
+		}
+	}
+	else if(ARB_direct_state_access)
+		return glMapNamedBuffer(id, GL_READ_WRITE);
+	else if(OES_mapbuffer)
+	{
+		BindRestore _bind(this, type);
+		return glMapBuffer(type, GL_READ_WRITE);
+	}
+	else
+		throw invalid_operation("Buffer::map");
 }
 
 bool Buffer::unmap()
 {
-	BindRestore _bind(this, type);
-	return glUnmapBuffer(type);
+	// TODO check if it's mapped
+	if(ARB_direct_state_access)
+		return glUnmapNamedBuffer(id);
+	else if(OES_mapbuffer)
+	{
+		BindRestore _bind(this, type);
+		return glUnmapBuffer(type);
+	}
+	else
+		return true;
 }
 
 void Buffer::bind_to(BufferType t) const
@@ -78,10 +127,10 @@ 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())
+		if(const VertexSetup *vs = VertexSetup::current())
 		{
-			// Don't change the binding in a mesh's vertex array object
-			if(this==m->get_index_buffer())
+			// Don't change the binding in a vertex array object
+			if(this==vs->get_index_buffer())
 				return;
 			throw invalid_operation("Buffer::bind_to(ELEMENT_ARRAY_BUFFER)");
 		}
@@ -92,14 +141,14 @@ void Buffer::bind_to(BufferType t) const
 const Buffer *Buffer::current(BufferType t)
 {
 	if(t==ELEMENT_ARRAY_BUFFER)
-		if(const Mesh *m = Mesh::current())
-			return m->get_index_buffer();
+		if(const VertexSetup *vs = VertexSetup::current())
+			return vs->get_index_buffer();
 	return binding(t);
 }
 
 void Buffer::unbind_from(BufferType type)
 {
-	if(type==ELEMENT_ARRAY_BUFFER && Mesh::current())
+	if(type==ELEMENT_ARRAY_BUFFER && VertexSetup::current())
 		throw invalid_operation("Buffer::unbind_from(ELEMENT_ARRAY_BUFFER)");
 	if(set_current(type, 0))
 		glBindBuffer(type, 0);
@@ -140,6 +189,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);
@@ -149,9 +205,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)