X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fbufferable.h;h=60ce307292d900f3d5df4e01b6df412f80e778e5;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=f1d52fb3ee514602d9452882518cc23fc5bc6c16;hpb=84e0e55710123e54617d342df852007f8b60af24;p=libs%2Fgl.git

diff --git a/source/core/bufferable.h b/source/core/bufferable.h
index f1d52fb3..60ce3072 100644
--- a/source/core/bufferable.h
+++ b/source/core/bufferable.h
@@ -30,7 +30,7 @@ public:
 
 private:
 	Buffer *buffer = 0;
-	unsigned offset = 0;
+	std::size_t offset = 0;
 	Bufferable *next_in_buffer = 0;
 	Bufferable *prev_in_buffer = 0;
 	mutable bool location_dirty = false;
@@ -50,7 +50,7 @@ public:
 
 	/** Returns the total amount of storage required by this object and others
 	in the same chain, including any alignment between objects. */
-	unsigned get_required_buffer_size() const;
+	std::size_t get_required_buffer_size() const;
 
 	/** Uploads new data into the buffer if necessary. */
 	void refresh() const { if(dirty) upload_data(0); }
@@ -67,7 +67,7 @@ public:
 	const Buffer *get_buffer() const { return buffer; }
 
 	/** Returns the size of the data, in bytes. */
-	virtual unsigned get_data_size() const = 0;
+	virtual std::size_t get_data_size() const = 0;
 
 protected:
 	/** Returns a pointer to the start of data in client memory. */
@@ -75,7 +75,7 @@ protected:
 
 	/** Returns the alignment required for the data, in bytes.  The offset is
 	guaranteed to be a multiple of this. */
-	virtual unsigned get_alignment() const { return 1; }
+	virtual std::size_t get_alignment() const { return 1; }
 
 	/** Updates the offsets for the chain so that data from different objects
 	does not overlap.  Should be called if either data size or alignment
@@ -84,7 +84,7 @@ protected:
 
 public:
 	/** Returns the offset of the data from the beginning of the buffer. */
-	unsigned get_offset() const { return offset; }
+	std::size_t get_offset() const { return offset; }
 
 private:
 	/** Uploads data to the buffer.  Receives pointer to mapped buffer memory as