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

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 1226dbe3..100e4b2e 100644
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,4 +1,6 @@
 #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"
 #include "mesh.h"
@@ -19,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()
@@ -46,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)
@@ -64,14 +79,41 @@ BufferRange *Buffer::create_range(unsigned s, unsigned o)
 
 void *Buffer::map(BufferAccess access)
 {
-	BindRestore _bind(this, type);
-	return glMapBuffer(type, access);
+	if(ARB_map_buffer_range)
+	{
+		GLenum access_bits = 0;
+		if(access==READ_ONLY)
+			access_bits = GL_MAP_READ_BIT;
+		else if(access==WRITE_ONLY)
+			access_bits = GL_MAP_WRITE_BIT;
+		else if(access==READ_WRITE)
+			access_bits = GL_MAP_READ_BIT|GL_MAP_WRITE_BIT;
+		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);
+		return glMapBuffer(type, 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