X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.h;h=fc9ace78c0ac0f48194a20fdcb1a8e4012be01e1;hb=5f78db03b3285c977760a41da1e3927720e50352;hp=4f9f32943df58e420848832d2d298914c74676e4;hpb=b69e2eeea92eae2c37c054a2a8b36f55e0ca2690;p=libs%2Fgl.git

diff --git a/source/buffer.h b/source/buffer.h
index 4f9f3294..fc9ace78 100644
--- a/source/buffer.h
+++ b/source/buffer.h
@@ -1,14 +1,25 @@
 #ifndef MSP_GL_BUFFER_H_
 #define MSP_GL_BUFFER_H_
 
+#include <stdexcept>
+#include <string>
 #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 {
 
+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 +42,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;
 
 /**
@@ -78,8 +96,13 @@ public:
 
 	unsigned get_size() const { return size; }
 
+	void require_size(unsigned) const;
+
 	BufferRange *create_range(unsigned, unsigned);
 
+	void *map(BufferAccess);
+	bool unmap();
+
 	/** Binds the buffer in its default slot. */
 	void bind() const { bind_to(type); }
 
@@ -89,12 +112,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 +134,7 @@ private:
 
 public:
 	BufferRange(Buffer &, unsigned, unsigned);
+	~BufferRange();
 
 	void data(const void *);