X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fbuffer.cpp;h=36ac440a54426c186c16ae238c51a337312445e8;hp=56705b8701b88a00b691bf25725d10042554679a;hb=HEAD;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/core/buffer.cpp b/source/core/buffer.cpp
index 56705b87..36ac440a 100644
--- a/source/core/buffer.cpp
+++ b/source/core/buffer.cpp
@@ -1,295 +1,117 @@
 #include <stdexcept>
-#include <msp/gl/extensions/arb_buffer_storage.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 "misc.h"
-#include "vertexsetup.h"
 
 using namespace std;
 
 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),
-	size(0)
-{
-	require_buffer_type(type);
-
-	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);
-}
-
-void Buffer::require_buffer_type(BufferType type)
-{
-	static Require _req_vbo(ARB_vertex_buffer_object);
-	if(type==PIXEL_PACK_BUFFER || type==PIXEL_UNPACK_BUFFER)
-		static Require _req_pbo(ARB_pixel_buffer_object);
-	else if(type==UNIFORM_BUFFER)
-		static Require _req_ubo(ARB_uniform_buffer_object);
-}
-
-void Buffer::storage(unsigned sz)
+void Buffer::storage(size_t sz, BufferUsage u)
 {
 	if(size>0)
-		throw invalid_operation("Buffer::storage");
+	{
+		if(sz!=size)
+			throw incompatible_data("Buffer::storage");
+		return;
+	}
 	if(sz==0)
 		throw invalid_argument("Buffer::storage");
 
 	size = sz;
-	if(ARB_buffer_storage)
-	{
-		static const int flags = GL_MAP_READ_BIT|GL_MAP_WRITE_BIT|GL_DYNAMIC_STORAGE_BIT;
-		if(ARB_direct_state_access)
-			glNamedBufferStorage(id, size, 0, flags);
-		else
-		{
-			BindRestore _bind(this, type);
-			glBufferStorage(type, size, 0, flags);
-		}
-	}
-}
+	usage = u;
 
-void Buffer::set_usage(BufferUsage)
-{
+	allocate();
 }
 
 void Buffer::data(const void *d)
 {
-	if(size==0)
-		throw invalid_operation("Buffer::data");
-
-	if(ARB_buffer_storage)
-		return sub_data(0, size, d);
-
-	if(ARB_direct_state_access)
-		glNamedBufferData(id, size, d, STATIC_DRAW);
-	else
-	{
-		BindRestore _bind(this, type);
-		glBufferData(type, size, d, STATIC_DRAW);
-	}
+	return sub_data(0, size, d);
 }
 
-void Buffer::data(unsigned sz, const void *d)
+void Buffer::sub_data(size_t off, size_t sz, const void *d)
 {
-	if(size==0)
-		storage(sz);
-	else if(sz!=size)
-		throw incompatible_data("Buffer::data");
-
-	data(d);
+	check_sub_data(off, sz, "Buffer::sub_data");
+	BufferBackend::sub_data(off, sz, d);
 }
 
-void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
+Buffer::AsyncTransfer Buffer::sub_data_async(size_t off, size_t sz)
 {
-	if(ARB_direct_state_access)
-		glNamedBufferSubData(id, off, sz, d);
-	else
-	{
-		BindRestore _bind(this, type);
-		glBufferSubData(type, off, sz, d);
-	}
+	check_sub_data(off, sz, "Buffer::sub_data_async");
+	return AsyncTransfer(*this, off, sz);
 }
 
-void Buffer::require_size(unsigned req_sz) const
+void Buffer::check_sub_data(size_t off, size_t sz, const char *func)
 {
-	if(size<req_sz)
-		throw buffer_too_small(format("buffer has %d bytes; %d required", size, req_sz));
+	if(size==0)
+		throw invalid_operation(func);
+	if(off>get_total_size() || off%size+sz>size)
+		throw out_of_range(func);
 }
 
-BufferRange *Buffer::create_range(unsigned s, unsigned o)
+void Buffer::require_size(size_t req_sz) const
 {
-	return new BufferRange(*this, s, o);
+	if(size<req_sz)
+		throw buffer_too_small(format("buffer has %d bytes; %d required", size, req_sz));
 }
 
 void *Buffer::map()
 {
-	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
+	if(size==0 || !can_map() || mapped)
 		throw invalid_operation("Buffer::map");
+	void *result = BufferBackend::map();
+	mapped = true;
+	return result;
 }
 
 bool Buffer::unmap()
 {
-	// 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;
+	if(size==0 || !can_map() || !mapped)
+		throw invalid_operation("Buffer::unmap");
+	bool result = BufferBackend::unmap();
+	mapped = false;
+	return result;
 }
 
-void Buffer::bind_to(BufferType t) const
-{
-	if(t!=type)
-		require_buffer_type(t);
-	if(t==ELEMENT_ARRAY_BUFFER)
-		if(const VertexSetup *vs = VertexSetup::current())
-		{
-			// 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)");
-		}
-	if(set_current(t, this))
-		glBindBuffer(t, id);
-}
-
-const Buffer *Buffer::current(BufferType t)
-{
-	if(t==ELEMENT_ARRAY_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 && VertexSetup::current())
-		throw invalid_operation("Buffer::unbind_from(ELEMENT_ARRAY_BUFFER)");
-	if(set_current(type, 0))
-		glBindBuffer(type, 0);
-}
 
-const Buffer *&Buffer::binding(BufferType type)
-{
-	switch(type)
-	{
-	case ARRAY_BUFFER:         return bound[0];
-	case ELEMENT_ARRAY_BUFFER: return bound[1];
-	case PIXEL_PACK_BUFFER:    return bound[2];
-	case PIXEL_UNPACK_BUFFER:  return bound[3];
-	case UNIFORM_BUFFER:       return bound[4];
-	default: throw invalid_argument("Buffer::binding");
-	}
-}
-
-bool Buffer::set_current(BufferType type, const Buffer *buf)
-{
-	const Buffer *&ptr = binding(type);
-	if(ptr==buf)
-		return false;
-
-	ptr = buf;
-	return true;
-}
-
-
-vector<const BufferRange *> BufferRange::bound_uniform;
-
-BufferRange::BufferRange(Buffer &b, unsigned o, unsigned s):
-	buffer(b),
+Buffer::AsyncTransfer::AsyncTransfer(Buffer &b, size_t o, size_t s):
+	buffer(&b),
 	offset(o),
-	size(s)
+	size(s),
+	dest_addr(0)
 {
-	if(o>buffer.get_size() || o+s>buffer.get_size())
-		throw out_of_range("BufferRange::BufferRange");
+	allocate();
 }
 
-BufferRange::~BufferRange()
+Buffer::AsyncTransfer::AsyncTransfer(AsyncTransfer &&other):
+	buffer(other.buffer),
+	offset(other.offset),
+	size(other.size),
+	dest_addr(other.dest_addr)
 {
-	for(unsigned i=0; i<bound_uniform.size(); ++i)
-		if(bound_uniform[i]==this)
-			unbind_from(UNIFORM_BUFFER, i);
+	other.dest_addr = 0;
 }
 
-void BufferRange::data(const void *d)
+Buffer::AsyncTransfer &Buffer::AsyncTransfer::operator=(AsyncTransfer &&other)
 {
-	buffer.sub_data(offset, size, d);
-}
+	if(dest_addr)
+		finalize();
 
-void BufferRange::bind_to(BufferType t, unsigned i)
-{
-	if(t!=buffer.type)
-		Buffer::require_buffer_type(t);
-	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)
-{
-	if(set_current(t, i, 0))
-	{
-		Buffer::set_current(t, 0);
-		glBindBufferBase(t, i, 0);
-	}
-}
+	buffer = other.buffer;
+	offset = other.offset;
+	size = other.size;
+	dest_addr = other.dest_addr;
 
-const BufferRange *&BufferRange::binding(BufferType type, unsigned index)
-{
-	if(type==UNIFORM_BUFFER)
-	{
-		if(index>=get_n_uniform_buffer_bindings())
-			throw out_of_range("BufferRange::binding");
-		if(bound_uniform.size()<=index)
-			bound_uniform.resize(index+1);
-		return bound_uniform[index];
-	}
-	else
-		throw invalid_argument("BufferRange::binding");
-}
+	other.dest_addr = 0;
 
-bool BufferRange::set_current(BufferType type, unsigned index, const BufferRange *buf)
-{
-	const BufferRange *&ptr = binding(type, index);
-	if(ptr==buf)
-		return false;
-
-	ptr = buf;
-	return true;
-}
-
-unsigned BufferRange::get_n_uniform_buffer_bindings()
-{
-	static unsigned count = get_i(GL_MAX_UNIFORM_BUFFER_BINDINGS);
-	return count;
+	return *this;
 }
 
-unsigned BufferRange::get_uniform_buffer_alignment()
+Buffer::AsyncTransfer::~AsyncTransfer()
 {
-	static unsigned align = get_i(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT);
-	return align;
+	if(dest_addr)
+		finalize();
 }
 
 } // namespace GL