Remove the deprecated ProgramBuilder class

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

diff --git a/source/buffer.h b/source/buffer.h
index 4f9f32943df58e420848832d2d298914c74676e4..cc5e58741c141f1fd5910e1abda23ec68a650a39 100644 (file)
--- a/source/buffer.h
+++ b/source/buffer.h
@@ -1,14 +1,26 @@
 #ifndef MSP_GL_BUFFER_H_
 #define MSP_GL_BUFFER_H_
 
+#include <stdexcept>
+#include <string>
 #include <vector>
+#include <msp/core/attributes.h>
 #include "gl.h"
+#include <msp/gl/extensions/arb_pixel_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_buffer_object.h>
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
+#include <msp/gl/extensions/oes_mapbuffer.h>
 
 namespace Msp {
 namespace GL {
 
+class buffer_too_small: public std::logic_error
+{
+public:
+       buffer_too_small(const std::string &w): std::logic_error(w) { }
+       virtual ~buffer_too_small() throw() { }
+};
+
 enum BufferType
 {
        ARRAY_BUFFER         = GL_ARRAY_BUFFER,
@@ -31,6 +43,13 @@ enum BufferUsage
        DYNAMIC_COPY = GL_DYNAMIC_COPY
 };
 
+enum BufferAccess
+{
+       READ_ONLY = GL_READ_ONLY,
+       WRITE_ONLY = GL_WRITE_ONLY,
+       READ_WRITE = GL_READ_WRITE
+};
+
 class BufferRange;
 
 /**
@@ -44,7 +63,6 @@ class Buffer
 
 private:
        BufferType type;
-       BufferUsage usage;
        unsigned id;
        unsigned size;
 
@@ -64,22 +82,35 @@ public:
        /** Returns the default binding type for the buffer. */
        BufferType get_type() const { return type; }
 
+       /** Defines the storage size of the buffer.  Must be called before data can
+       be uploaded.  Storage cannot be changed once set. */
+       void storage(unsigned);
+
        /** Sets the usage hint of the buffer.  It will take effect the next time
        the buffer's contents are defined. */
-       void set_usage(BufferUsage);
+       DEPRECATED void set_usage(BufferUsage);
 
        /** Uploads data into the buffer, completely replacing any previous
-       contents. */
-       void data(unsigned, const void *);
+       contents.  Storage must be defined beforehand.  The data must have size
+       matching the defined storage. */
+       void data(const void *);
 
-       /** Overwrites part of the buffer data with new data.  The buffer size can
-       not be changed with this call. */
+       DEPRECATED void data(unsigned, const void *);
+
+       /** 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 require_size(unsigned) const;
+
        BufferRange *create_range(unsigned, unsigned);
 
+       void *map();
+       DEPRECATED void *map(BufferAccess) { return map(); }
+       bool unmap();
+
        /** Binds the buffer in its default slot. */
        void bind() const { bind_to(type); }
 
@@ -89,12 +120,11 @@ public:
        /** Unbinds the buffer from its default slot. */
        void unbind() const { unbind_from(type); }
 
-       static const Buffer *current(BufferType t) { return binding(t); }
+       static const Buffer *current(BufferType);
        static void unbind_from(BufferType);
 private:
        static const Buffer *&binding(BufferType);
        static bool set_current(BufferType, const Buffer *);
-       static void restore(const Buffer *, BufferType);
 };
 
 
@@ -112,6 +142,7 @@ private:
 
 public:
        BufferRange(Buffer &, unsigned, unsigned);
+       ~BufferRange();
 
        void data(const void *);