X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuffer.cpp;h=100e4b2ea40a08b4858b41abf043f7b4d84c11eb;hp=080c3fb380dc6dbf605e3a843b5ffb1e9a2851ba;hb=08e19bc2b4eba572bc7699378cf55cd8772ac67e;hpb=b2c8b2238877f76cdea184cca70336b15ddb78d9

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 080c3fb3..100e4b2e 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()
@@ -47,15 +51,25 @@ void Buffer::set_usage(BufferUsage 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 +81,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,8 +88,16 @@ 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 if(ARB_direct_state_access)
+		return glMapNamedBuffer(id, access);
 	else
 	{
 		BindRestore _bind(this, type);
@@ -86,8 +107,13 @@ void *Buffer::map(BufferAccess access)
 
 bool Buffer::unmap()
 {
-	BindRestore _bind(this, type);
-	return glUnmapBuffer(type);
+	if(ARB_direct_state_access)
+		return glUnmapNamedBuffer(id);
+	else
+	{
+		BindRestore _bind(this, type);
+		return glUnmapBuffer(type);
+	}
 }
 
 void Buffer::bind_to(BufferType t) const