X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fbuffer.h;h=b642738e0e96ef370a5e748701be071998e2de54;hp=cc5e58741c141f1fd5910e1abda23ec68a650a39;hb=e70662d7812464159f2e47f4bebb69d88f89ae93;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/core/buffer.h b/source/core/buffer.h
index cc5e5874..b642738e 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,142 +15,44 @@ 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
-};
+/**
+Stores data in GPU memory.
 
-class BufferRange;
+Memory must be allocated for the buffer by calling storage().  Contents can
+then be modified either synchronously with the data() and sub_data() functions,
+or asynchronously by memory-mapping the buffer.
 
-/**
-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.
+Applications normally don't need to deal with Buffers directly.  They're
+managed by other classes such as Mesh and ProgramData.
 */
-class Buffer
+class Buffer: public BufferBackend
 {
-	friend class BufferRange;
+	friend BufferBackend;
 
 private:
-	BufferType type;
-	unsigned id;
-	unsigned size;
-
-	static const Buffer *bound[5];
+	std::size_t size = 0;
 
 public:
-	Buffer(BufferType);
-	~Buffer();
+	/** Sets the storage size and allocates memory for the buffer.  Size cannot
+	be changed once set. */
+	void storage(std::size_t);
 
-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; }
-
-	/** 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. */
-	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. */
+	/** Replaces contents of the entire buffer.  Allocated storage must exist.
+	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 *);
-
-	unsigned get_size() const { return size; }
-
-	void require_size(unsigned) const;
+	/** Replaces a range of bytes in the buffer.  Allocated storage must exist.
+	The range must be fully inside the buffer. */
+	void sub_data(std::size_t, std::size_t, const void *);
 
-	BufferRange *create_range(unsigned, unsigned);
+	std::size_t get_size() const { return size; }
 
-	void *map();
-	DEPRECATED void *map(BufferAccess) { return map(); }
-	bool unmap();
+	void require_size(std::size_t) const;
 
-	/** Binds the buffer in its default slot. */
-	void bind() const { bind_to(type); }
+	using BufferBackend::map;
+	using BufferBackend::unmap;
 
-	/** Binds the buffer in an alternate slot. */
-	void bind_to(BufferType) const;
-
-	/** Unbinds the buffer from its default slot. */
-	void unbind() const { unbind_from(type); }
-
-	static const Buffer *current(BufferType);
-	static void unbind_from(BufferType);
-private:
-	static const Buffer *&binding(BufferType);
-	static bool set_current(BufferType, const Buffer *);
-};
-
-
-/**
-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:
-	static unsigned get_n_uniform_buffer_bindings();
-	static unsigned get_uniform_buffer_alignment();
+	using BufferBackend::set_debug_name;
 };
 
 } // namespace GL