X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbuffer.h;h=2366ec5ce0dd3269ee13db7d80bd53eade0fd565;hb=f2bb1caa233930e1148613e9d5daa2c29b0fe271;hp=83e75927ae31c3a44cd81420cea8f626a39c605e;hpb=f1244e29afd2a36aafc2373d485457b4cb0411ff;p=libs%2Fgl.git

diff --git a/source/core/buffer.h b/source/core/buffer.h
index 83e75927..2366ec5c 100644
--- a/source/core/buffer.h
+++ b/source/core/buffer.h
@@ -3,13 +3,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>
+#include "buffer_backend.h"
 
 namespace Msp {
 namespace GL {
@@ -21,83 +15,28 @@ public:
 	virtual ~buffer_too_small() throw() { }
 };
 
-enum BufferType
-{
-	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,
-	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;
-
 /**
 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
 {
-	friend class BufferRange;
+	friend BufferBackend;
 
 private:
-	unsigned id;
-	unsigned size;
-	bool allocated;
-
-	static const Buffer *bound[5];
+	unsigned size = 0;
 
 public:
-	Buffer();
-	~Buffer();
-
-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; }
-
 	/** Defines the storage size of the buffer.  Must be called before data can
 	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 *);
@@ -106,55 +45,10 @@ public:
 
 	void require_size(unsigned) const;
 
-	BufferRange *create_range(unsigned, unsigned);
-
-	void *map();
-	DEPRECATED void *map(BufferAccess) { return map(); }
-	bool unmap();
-
-	/** Binds the buffer. */
-	void bind_to(BufferType) const;
+	using BufferBackend::map;
+	using BufferBackend::unmap;
 
-	static const Buffer *current(BufferType);
-	static void unbind_from(BufferType);
-private:
-	static const Buffer *&binding(BufferType);
-	static bool set_current(BufferType, const Buffer *);
-
-public:
-	void set_debug_name(const std::string &);
-};
-
-
-/**
-A proxy for a subset of a buffer.  Can be bound for use with uniform blocks.
-*/
-class BufferRange
-{
-private:
-	Buffer &buffer;
-	unsigned offset;
-	unsigned size;
-
-	static std::vector<const BufferRange *> bound_uniform;
-
-public:
-	BufferRange(Buffer &, unsigned, unsigned);
-	~BufferRange();
-
-	void data(const void *);
-
-	void bind_to(BufferType, unsigned);
-
-	static const BufferRange *current(BufferType t, unsigned i) { return binding(t, i); }
-	static void unbind_from(BufferType, unsigned);
-private:
-	static const BufferRange *&binding(BufferType, unsigned);
-	static bool set_current(BufferType, unsigned, const BufferRange *);
-
-public:
-	DEPRECATED static unsigned get_n_uniform_buffer_bindings();
-	DEPRECATED static unsigned get_uniform_buffer_alignment();
+	using BufferBackend::set_debug_name;
 };
 
 } // namespace GL