X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuffer.h;h=cc5e58741c141f1fd5910e1abda23ec68a650a39;hp=2961cdb315ae70802847e8b5e414e325f512aa4f;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=ffe1debbd757d20f7250fd8572c2c46cd901f559

diff --git a/source/buffer.h b/source/buffer.h
index 2961cdb3..cc5e5874 100644
--- a/source/buffer.h
+++ b/source/buffer.h
@@ -63,7 +63,6 @@ class Buffer
 
 private:
 	BufferType type;
-	BufferUsage usage;
 	unsigned id;
 	unsigned size;
 
@@ -83,16 +82,23 @@ public:
 	/** 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. */
-	void data(unsigned, const void *);
+	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.  The buffer size can
-	not be changed with this call. */
+	/** 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; }