X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbuffer.cpp;h=013a136a560a2a5866ee6bf7c343b0102cf9e246;hb=4d146fba83f1ee7b8bd2249648a66db51857730f;hp=56810b6f4ff12aa41f9c37b7812f5d4496187e7a;hpb=a061bbfa87391ddea42c6220c1e17054d5b6b0c8;p=libs%2Fgl.git

diff --git a/source/core/buffer.cpp b/source/core/buffer.cpp
index 56810b6f..013a136a 100644
--- a/source/core/buffer.cpp
+++ b/source/core/buffer.cpp
@@ -2,8 +2,10 @@
 #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/gl/extensions/khr_debug.h>
 #include <msp/strings/format.h>
 #include "buffer.h"
+#include "deviceinfo.h"
 #include "error.h"
 #include "misc.h"
 #include "vertexsetup.h"
@@ -49,7 +51,11 @@ void Buffer::require_buffer_type(BufferType type)
 void Buffer::storage(unsigned sz)
 {
 	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");
 
@@ -142,25 +148,16 @@ BufferRange *Buffer::create_range(unsigned s, unsigned o)
 
 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)
+	static Require _req(ARB_map_buffer_range);
+
+	allocate();
+	if(ARB_direct_state_access)
+		return glMapNamedBufferRange(id, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
+	else
 	{
 		BindRestore _bind(this, type);
-		return glMapBuffer(type, GL_READ_WRITE);
+		return glMapBufferRange(type, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
 	}
-	else
-		throw invalid_operation("Buffer::map");
 }
 
 bool Buffer::unmap()
@@ -232,6 +229,16 @@ bool Buffer::set_current(BufferType type, const Buffer *buf)
 	return true;
 }
 
+void Buffer::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+	if(KHR_debug)
+		glObjectLabel(GL_BUFFER, id, name.size(), name.c_str());
+#else
+	(void)name;
+#endif
+}
+
 
 vector<const BufferRange *> BufferRange::bound_uniform;
 
@@ -281,7 +288,7 @@ const BufferRange *&BufferRange::binding(BufferType type, unsigned index)
 {
 	if(type==UNIFORM_BUFFER)
 	{
-		if(index>=get_n_uniform_buffer_bindings())
+		if(index>=Limits::get_global().max_uniform_bindings)
 			throw out_of_range("BufferRange::binding");
 		if(bound_uniform.size()<=index)
 			bound_uniform.resize(index+1);
@@ -303,14 +310,12 @@ bool BufferRange::set_current(BufferType type, unsigned index, const BufferRange
 
 unsigned BufferRange::get_n_uniform_buffer_bindings()
 {
-	static unsigned count = get_i(GL_MAX_UNIFORM_BUFFER_BINDINGS);
-	return count;
+	return Limits::get_global().max_uniform_bindings;
 }
 
 unsigned BufferRange::get_uniform_buffer_alignment()
 {
-	static unsigned align = get_i(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT);
-	return align;
+	return Limits::get_global().uniform_buffer_alignment;
 }
 
 } // namespace GL