Add debug name capability to more classes

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

diff --git a/source/core/buffer.cpp b/source/core/buffer.cpp
index 56705b8701b88a00b691bf25725d10042554679a..00fd9cd3d42ac0597c255413b983f8d704b73bb4 100644 (file)
--- a/source/core/buffer.cpp
+++ b/source/core/buffer.cpp
@@ -2,6 +2,7 @@
 #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/gl/extensions/khr_debug.h>
 #include <msp/strings/format.h>
 #include "buffer.h"
 #include "error.h"
@@ -18,7 +19,8 @@ BufferType buffer_types[] = { ARRAY_BUFFER, ELEMENT_ARRAY_BUFFER, PIXEL_PACK_BUF
 
 Buffer::Buffer(BufferType t):
        type(t),
-       size(0)
+       size(0),
+       allocated(false)
 {
        require_buffer_type(type);
 
@@ -48,11 +50,24 @@ void Buffer::require_buffer_type(BufferType type)
 void Buffer::storage(unsigned sz)
 {
        if(size>0)
-               throw invalid_operation("Buffer::storage");
+       {
+               if(sz!=size)
+                       throw incompatible_data("Buffer::storage");
+               return;
+       }
        if(sz==0)
                throw invalid_argument("Buffer::storage");
 
        size = sz;
+}
+
+void Buffer::allocate()
+{
+       if(size==0)
+               throw invalid_operation("Buffer::allocate");
+       if(allocated)
+               return;
+
        if(ARB_buffer_storage)
        {
                static const int flags = GL_MAP_READ_BIT|GL_MAP_WRITE_BIT|GL_DYNAMIC_STORAGE_BIT;
@@ -63,7 +78,11 @@ void Buffer::storage(unsigned sz)
                        BindRestore _bind(this, type);
                        glBufferStorage(type, size, 0, flags);
                }
+
+               allocated = true;
        }
+       else
+               data(0);
 }
 
 void Buffer::set_usage(BufferUsage)
@@ -85,6 +104,8 @@ void Buffer::data(const void *d)
                BindRestore _bind(this, type);
                glBufferData(type, size, d, STATIC_DRAW);
        }
+
+       allocated = true;
 }
 
 void Buffer::data(unsigned sz, const void *d)
@@ -99,6 +120,11 @@ void Buffer::data(unsigned sz, const void *d)
 
 void Buffer::sub_data(unsigned off, unsigned sz, const void *d)
 {
+       if(size==0)
+               throw invalid_operation("Buffer::sub_data");
+
+       allocate();
+
        if(ARB_direct_state_access)
                glNamedBufferSubData(id, off, sz, d);
        else
@@ -121,6 +147,7 @@ BufferRange *Buffer::create_range(unsigned s, unsigned o)
 
 void *Buffer::map()
 {
+       allocate();
        if(ARB_map_buffer_range)
        {
                if(ARB_direct_state_access)
@@ -211,6 +238,16 @@ bool Buffer::set_current(BufferType type, const Buffer *buf)
        return true;
 }
 
+void Buffer::set_debug_name(const string &name)
+{
+#ifdef DEBUG
+       if(KHR_debug)
+               glObjectLabel(GL_BUFFER, id, name.size(), name.c_str());
+#else
+       (void)name;
+#endif
+}
+
 
 vector<const BufferRange *> BufferRange::bound_uniform;