X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuffer.h;h=e43536e238da3f50b66fc875f499aeb4d0b90286;hb=6c525eff3eaaa617648a869449ed3bddf9c1936d;hp=858f502d1c4a2e196b44f5d31da11681d94979a5;hpb=7015197bb127b92519cd93a2031a5c188d3fbd76;p=libs%2Fgl.git

diff --git a/source/buffer.h b/source/buffer.h
index 858f502d..e43536e2 100644
--- a/source/buffer.h
+++ b/source/buffer.h
@@ -31,6 +31,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;
 
 /**
@@ -80,6 +87,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); }
 
@@ -89,30 +99,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); }
 };