Remove the separate allocation step from textures and buffers

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

diff --git a/source/core/buffer.h b/source/core/buffer.h
index a80e52a68b9c34b00e499c6a16fb0b9e85446d39..9144afaed3d1682f28efd8076988c8e815a977db 100644 (file)
--- a/source/core/buffer.h
+++ b/source/core/buffer.h
@@ -4,12 +4,7 @@
 #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 {
@@ -21,26 +16,6 @@ public:
        virtual ~buffer_too_small() throw() { }
 };
 
-enum BufferUsage
-{
-       STREAM_DRAW  = GL_STREAM_DRAW,
-       STREAM_READ  = GL_STREAM_READ,
-       STREAM_COPY  = GL_STREAM_COPY,
-       STATIC_DRAW  = GL_STATIC_DRAW,
-       STATIC_READ  = GL_STATIC_READ,
-       STATIC_COPY  = GL_STATIC_COPY,
-       DYNAMIC_DRAW = GL_DYNAMIC_DRAW,
-       DYNAMIC_READ = GL_DYNAMIC_READ,
-       DYNAMIC_COPY = GL_DYNAMIC_COPY
-};
-
-enum BufferAccess
-{
-       READ_ONLY = GL_READ_ONLY,
-       WRITE_ONLY = GL_WRITE_ONLY,
-       READ_WRITE = GL_READ_WRITE
-};
-
 class BufferRange;
 
 /**
@@ -50,12 +25,11 @@ UniformBlock classes contain built-in support for buffers.
 */
 class Buffer
 {
-       friend class BufferRange;
-
 private:
        unsigned id;
        unsigned size;
-       bool allocated;
+
+       static Buffer *scratch_binding;
 
 public:
        Buffer();
@@ -68,21 +42,11 @@ public:
        be uploaded.  Storage cannot be changed once set. */
        void storage(unsigned);
 
-       /** Allocates storage for the buffer.  The contents are initially undefined.
-       If storage has already been allocated, does nothing. */
-       void allocate();
-
-       /** Sets the usage hint of the buffer.  It will take effect the next time
-       the buffer's contents are defined. */
-       DEPRECATED void set_usage(BufferUsage);
-
        /** Uploads data into the buffer, completely replacing any previous
        contents.  Storage must be defined beforehand.  The data must have size
        matching the defined storage. */
        void data(const void *);
 
-       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 *);
@@ -92,10 +56,14 @@ public:
        void require_size(unsigned) const;
 
        void *map();
-       DEPRECATED void *map(BufferAccess) { return map(); }
        bool unmap();
 
        void set_debug_name(const std::string &);
+
+private:
+       void bind_scratch();
+public:
+       static void unbind_scratch();
 };
 
 } // namespace GL