Cosmetic fixes

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

diff --git a/source/buffer.h b/source/buffer.h
index 6f0a9708e18069485460587d3295b63aaf6055b1..39e88cd1ce7647b74ea5f7f6b75cba575ea0d403 100644 (file)
--- a/source/buffer.h
+++ b/source/buffer.h
@@ -3,30 +3,41 @@
 
 #include <vector>
 #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 {
 
 enum BufferType
 {
-       ARRAY_BUFFER         = GL_ARRAY_BUFFER_ARB,
-       ELEMENT_ARRAY_BUFFER = GL_ELEMENT_ARRAY_BUFFER_ARB,
-       PIXEL_PACK_BUFFER    = GL_PIXEL_PACK_BUFFER_ARB,
-       PIXEL_UNPACK_BUFFER  = GL_PIXEL_UNPACK_BUFFER_ARB,
+       ARRAY_BUFFER         = GL_ARRAY_BUFFER,
+       ELEMENT_ARRAY_BUFFER = GL_ELEMENT_ARRAY_BUFFER,
+       PIXEL_PACK_BUFFER    = GL_PIXEL_PACK_BUFFER,
+       PIXEL_UNPACK_BUFFER  = GL_PIXEL_UNPACK_BUFFER,
        UNIFORM_BUFFER       = GL_UNIFORM_BUFFER
 };
 
 enum BufferUsage
 {
-       STREAM_DRAW  = GL_STREAM_DRAW_ARB,
-       STREAM_READ  = GL_STREAM_READ_ARB,
-       STREAM_COPY  = GL_STREAM_COPY_ARB,
-       STATIC_DRAW  = GL_STATIC_DRAW_ARB,
-       STATIC_READ  = GL_STATIC_READ_ARB,
-       STATIC_COPY  = GL_STATIC_COPY_ARB,
-       DYNAMIC_DRAW = GL_DYNAMIC_DRAW_ARB,
-       DYNAMIC_READ = GL_DYNAMIC_READ_ARB,
-       DYNAMIC_COPY = GL_DYNAMIC_COPY_ARB
+       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;
@@ -56,6 +67,12 @@ private:
        static void require_buffer_type(BufferType);
 
 public:
+       /** Returns the OpenGL ID of the buffer.  For internal use only. */
+       unsigned get_id() const { return id; }
+
+       /** Returns the default binding type for the buffer. */
+       BufferType get_type() const { return type; }
+
        /** Sets the usage hint of the buffer.  It will take effect the next time
        the buffer's contents are defined. */
        void set_usage(BufferUsage);
@@ -72,6 +89,9 @@ public:
 
        BufferRange *create_range(unsigned, unsigned);
 
+       void *map(BufferAccess);
+       bool unmap();
+
        /** Binds the buffer in its default slot. */
        void bind() const { bind_to(type); }
 
@@ -81,30 +101,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);
-};
-
-
-/**
-An adaptor for Buffer to make it compatible with Bind.
-*/
-template<BufferType T>
-class BufferAlias
-{
-private:
-       const Buffer &buffer;
-
-public:
-       BufferAlias(const Buffer &b): buffer(b) { }
-
-       void bind() const { buffer.bind_to(T); }
-       static const Buffer *current() { return Buffer::current(T); }
-       static void unbind() { Buffer::unbind_from(T); }
 };
 
 
@@ -122,6 +123,7 @@ private:
 
 public:
        BufferRange(Buffer &, unsigned, unsigned);
+       ~BufferRange();
 
        void data(const void *);
 
@@ -135,6 +137,7 @@ private:
 
 public:
        static unsigned get_n_uniform_buffer_bindings();
+       static unsigned get_uniform_buffer_alignment();
 };
 
 } // namespace GL