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

diff --git a/source/buffer.h b/source/buffer.h
index b3a2902f..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;
 
 /**
@@ -58,6 +65,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);
@@ -74,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); }
 
@@ -83,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); }
 };