X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuffer.cpp;h=2b18d7d7d7d3bf0a47611207850aec5aabc4cc9d;hp=080c3fb380dc6dbf605e3a843b5ffb1e9a2851ba;hb=a4549c55a6d47129bd9e42c6a49a671b759ce6d9;hpb=00ffc97eda26687f98f04226c2da728e2ca1220e

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 080c3fb3..2b18d7d7 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,4 +1,5 @@
 #include <stdexcept>
+#include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_map_buffer_range.h>
 #include "buffer.h"
 #include "error.h"
@@ -20,7 +21,10 @@ 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()
@@ -42,20 +46,31 @@ 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);
+	}
 }
 
 BufferRange *Buffer::create_range(unsigned s, unsigned o)
@@ -67,7 +82,6 @@ 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;
@@ -75,19 +89,37 @@ void *Buffer::map(BufferAccess access)
 			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);
+		if(ARB_direct_state_access)
+			return glMapNamedBufferRange(id, 0, size, access_bits);
+		else
+		{
+			BindRestore _bind(this, type);
+			return glMapBufferRange(type, 0, size, access_bits);
+		}
 	}
-	else
+	else if(ARB_direct_state_access)
+		return glMapNamedBuffer(id, access);
+	else if(OES_mapbuffer)
 	{
 		BindRestore _bind(this, type);
 		return glMapBuffer(type, access);
 	}
+	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