Remove the deprecated ProgramBuilder class

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

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 4b485ddad6cb266d1d96d2e844c40583cb9ace3a..56705b8701b88a00b691bf25725d10042554679a 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,6 +1,8 @@
 #include <stdexcept>
+#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/strings/format.h>
 #include "buffer.h"
 #include "error.h"
 #include "misc.h"
@@ -16,7 +18,6 @@ BufferType buffer_types[] = { ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, PIXEL_PACK_BUF
 
 Buffer::Buffer(BufferType t):
        type(t),
-       usage(STATIC_DRAW),
        size(0)
 {
        require_buffer_type(type);
@@ -44,22 +45,56 @@ void Buffer::require_buffer_type(BufferType type)
                static Require _req_ubo(ARB_uniform_buffer_object);
 }
 
-void Buffer::set_usage(BufferUsage u)
+void Buffer::storage(unsigned sz)
 {
-       // TODO OpenGL ES 2.0 doesn't support read or copy usages
-       usage = u;
+       if(size>0)
+               throw invalid_operation("Buffer::storage");
+       if(sz==0)
+               throw invalid_argument("Buffer::storage");
+
+       size = sz;
+       if(ARB_buffer_storage)
+       {
+               static const int flags = GL_MAP_READ_BIT|GL_MAP_WRITE_BIT|GL_DYNAMIC_STORAGE_BIT;
+               if(ARB_direct_state_access)
+                       glNamedBufferStorage(id, size, 0, flags);
+               else
+               {
+                       BindRestore _bind(this, type);
+                       glBufferStorage(type, size, 0, flags);
+               }
+       }
 }
 
-void Buffer::data(unsigned sz, const void *d)
+void Buffer::set_usage(BufferUsage)
+{
+}
+
+void Buffer::data(const void *d)
 {
+       if(size==0)
+               throw invalid_operation("Buffer::data");
+
+       if(ARB_buffer_storage)
+               return sub_data(0, size, d);
+
        if(ARB_direct_state_access)
-               glNamedBufferData(id, sz, d, usage);
+               glNamedBufferData(id, size, d, STATIC_DRAW);
        else
        {
                BindRestore _bind(this, type);
-               glBufferData(type, sz, d, usage);
+               glBufferData(type, size, d, STATIC_DRAW);
        }
-       size = sz;
+}
+
+void Buffer::data(unsigned sz, const void *d)
+{
+       if(size==0)
+               storage(sz);
+       else if(sz!=size)
+               throw incompatible_data("Buffer::data");
+
+       data(d);
 }
 
 void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
@@ -73,36 +108,35 @@ void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
        }
 }
 
+void Buffer::require_size(unsigned req_sz) const
+{
+       if(size<req_sz)
+               throw buffer_too_small(format("buffer has %d bytes; %d required", size, req_sz));
+}
+
 BufferRange *Buffer::create_range(unsigned s, unsigned o)
 {
        return new BufferRange(*this, s, o);
 }
 
-void *Buffer::map(BufferAccess access)
+void *Buffer::map()
 {
        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);
+                       return glMapNamedBufferRange(id, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
                else
                {
                        BindRestore _bind(this, type);
-                       return glMapBufferRange(type, 0, size, access_bits);
+                       return glMapBufferRange(type, 0, size, GL_MAP_READ_BIT|GL_MAP_WRITE_BIT);
                }
        }
        else if(ARB_direct_state_access)
-               return glMapNamedBuffer(id, access);
+               return glMapNamedBuffer(id, GL_READ_WRITE);
        else if(OES_mapbuffer)
        {
                BindRestore _bind(this, type);
-               return glMapBuffer(type, access);
+               return glMapBuffer(type, GL_READ_WRITE);
        }
        else
                throw invalid_operation("Buffer::map");