Use size_t to store sizes of buffers and such

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

diff --git a/source/core/buffer.h b/source/core/buffer.h
index 9144afaed3d1682f28efd8076988c8e815a977db..810bfc1a56253e181f7cc55b5d228c3441e99fee 100644 (file)
--- a/source/core/buffer.h
+++ b/source/core/buffer.h
@@ -3,8 +3,7 @@
 
 #include <stdexcept>
 #include <string>
-#include <vector>
-#include "gl.h"
+#include "buffer_backend.h"
 
 namespace Msp {
 namespace GL {
@@ -16,31 +15,22 @@ public:
        virtual ~buffer_too_small() throw() { }
 };
 
-class BufferRange;
-
 /**
 A buffer for storing data in GL memory.  Putting vertex and index data in
 buffers can improve rendering performance.  The VertexArray, Mesh and
 UniformBlock classes contain built-in support for buffers.
 */
-class Buffer
+class Buffer: public BufferBackend
 {
-private:
-       unsigned id;
-       unsigned size;
+       friend BufferBackend;
 
-       static Buffer *scratch_binding;
+private:
+       std::size_t size = 0;
 
 public:
-       Buffer();
-       ~Buffer();
-
-       /** Returns the OpenGL ID of the buffer.  For internal use only. */
-       unsigned get_id() const { return id; }
-
        /** Defines the storage size of the buffer.  Must be called before data can
        be uploaded.  Storage cannot be changed once set. */
-       void storage(unsigned);
+       void storage(std::size_t);
 
        /** Uploads data into the buffer, completely replacing any previous
        contents.  Storage must be defined beforehand.  The data must have size
@@ -49,21 +39,16 @@ public:
 
        /** Overwrites part of the buffer data with new data.  Storage must be
        defined beforehand. */
-       void sub_data(unsigned, unsigned, const void *);
-
-       unsigned get_size() const { return size; }
+       void sub_data(std::size_t, std::size_t, const void *);
 
-       void require_size(unsigned) const;
+       std::size_t get_size() const { return size; }
 
-       void *map();
-       bool unmap();
+       void require_size(std::size_t) const;
 
-       void set_debug_name(const std::string &);
+       using BufferBackend::map;
+       using BufferBackend::unmap;
 
-private:
-       void bind_scratch();
-public:
-       static void unbind_scratch();
+       using BufferBackend::set_debug_name;
 };
 
 } // namespace GL