X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=b7070e8f78093c1e4543b65feb4fafab0720888d;hb=2ba5af95fb7341b0e6b212e28d03208c6747aae5;hp=801d18dd339524c15b945544d8e895aacd024d94;hpb=2edfcf08707c3627b6b27289ba607a7183d63b01;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index 801d18dd..b7070e8f 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -55,20 +55,24 @@ public:
 	undefined.  If storage has already been allocated, does nothing. */
 	void allocate(unsigned level);
 
-	/** 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, PixelComponents fmt, DataType type, const void *data);
+	/** 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
-	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,
+	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);
 
-	/** 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
-	the defined storage.
+	/** 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.
 
 	If srgb is true and storage is determined by this call, then an sRGB pixel
 	format will be used. */