X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=801d18dd339524c15b945544d8e895aacd024d94;hb=9087cc0a372b9c739f15398c7a22c0a6eb5041bb;hp=092f12ba47aaa77167aaf8ee67648045dc0f8328;hpb=a8a04ddd95e57a8f103c04dba317addc32866689;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index 092f12ba..801d18dd 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -48,6 +48,9 @@ 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);
@@ -55,13 +58,13 @@ public:
 	/** Uploads an image to the texture.  Storage must be defined beforehand.
 	The image data must have dimensions and format compatible with the defined
 	storage. */
-	void image(unsigned level, PixelFormat fmt, DataType type, const void *data);
+	void image(unsigned level, PixelComponents fmt, DataType type, const void *data);
 
 	/** Updates a rectangular region of the texture.  Storage must be defined
 	and allocated beforehand.  The update region must be fully inside the
 	texture. */
 	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
-		PixelFormat fmt, DataType type, const void *data);
+		PixelComponents fmt, DataType type, const void *data);
 
 	/** Uploads an image to the texture.  If storage has not been defined, it
 	will be set to match the image.  Otherwise the image must be compatible with