Add getter for Animation::looping

[libs/gl.git] / source / buffer.cpp

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 066ab96c5919b2c154879224323f704662ce2e14..2b18d7d7d7d3bf0a47611207850aec5aabc4cc9d 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,7 +1,6 @@
 #include <stdexcept>
-#include <msp/gl/extensions/arb_pixel_buffer_object.h>
-#include <msp/gl/extensions/arb_uniform_buffer_object.h>
-#include <msp/gl/extensions/arb_vertex_buffer_object.h>
+#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"
@@ -22,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()
@@ -44,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,14 +80,46 @@ 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 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