X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.h;h=eba553b00c27089e44300424166afee3f8a6b54b;hb=ada4b7614137221b64a00f31fde1498064e9fb19;hp=877555c0f5ba43d4cdefb5a78af34225cc2e4756;hpb=2b7f8e45e75bec30c1ea27fc0efd8286f67adc3f;p=libs%2Fgl.git

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 877555c0..eba553b0 100644
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -36,7 +36,6 @@ private:
 	unsigned width;
 	unsigned height;
 	unsigned levels;
-	unsigned allocated;
 
 public:
 	Texture2D(ResourceManager * = 0);
@@ -49,28 +48,16 @@ public:
 	it can't be changed. */
 	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv = 0);
 
-	DEPRECATED void storage(PixelComponents cm, unsigned wd, unsigned ht, unsigned lv = 0)
-	{ storage(make_pixelformat(cm, UNSIGNED_BYTE), wd, ht, lv); }
-
-	/** Allocates storage for the texture.  The contents are initially
-	undefined.  If storage has already been allocated, does nothing. */
-	void allocate(unsigned level);
-
 	/** Updates the contents of the entire texture.  Storage must be defined
 	beforehand.  The image data must have dimensions and format matching the
 	defined storage. */
 	virtual void image(unsigned level, const void *data);
 
-	DEPRECATED void image(unsigned level, PixelComponents fmt, DataType type, const void *data);
-
 	/** Updates a rectangular region of the texture.  Storage must be defined
 	beforehand.  The image data must be in a format mathing the defined storage
 	and the update region must be fully inside the texture. */
 	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data);
 
-	DEPRECATED void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
-		PixelComponents fmt, DataType type, const void *data);
-
 	/** Updates the contents of the entire texture from an image.  If storage
 	has not been defined, it will be set to match the image.  Otherwise the
 	image must match the defined storage. */
@@ -91,7 +78,7 @@ private:
 
 public:
 	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-	virtual UInt64 get_data_size() const;
+	virtual std::uint64_t get_data_size() const;
 	virtual void unload();
 };