X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.h;h=1f50e056d8cb286d8e99b4c739f83e5f09c777bd;hb=635e5dc;hp=0808471624db87d3f64d00ed5481171457bd9068;hpb=a8a04ddd95e57a8f103c04dba317addc32866689;p=libs%2Fgl.git

diff --git a/source/texture3d.h b/source/texture3d.h
index 08084716..1f50e056 100644
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -46,30 +46,35 @@ public:
 	it can't be changed. */
 	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv = 0);
 
+	DEPRECATED void storage(PixelComponents c, unsigned w, unsigned h, unsigned d, unsigned l = 0)
+	{ storage(make_pixelformat(c, UNSIGNED_BYTE), w, h, d, l); }
+
 	/** Allocates storage for the texture.  The contents are initially
 	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, PixelFormat 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. */
+	void image(unsigned level, const void *data);
+
+	DEPRECATED void image(unsigned level, PixelComponents comp, DataType type, const void *data);
 
 	/** Updates a cuboid-shaped 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, int z, unsigned wd, unsigned ht, unsigned dp,
-		PixelFormat fmt, DataType type, const void *data);
+	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, int z, unsigned wd, unsigned ht, unsigned dp, const void *data);
 
-	/** Uploads an image to the texture.  If storage has not been defined, it
-	will be set to match the image.  In this case the image will be treated as
-	a stack of square layers and its height must be divisible by its width.
-	Otherwise the image must be compatible with the defined storage.
+	DEPRECATED void sub_image(unsigned level,
+		int x, int y, int z, unsigned wd, unsigned ht, unsigned dp,
+		PixelComponents comp, DataType type, const void *data);
 
-	If srgb is true and storage is determined by this call, then an sRGB pixel
-	format will be used. */
-	virtual void image(const Graphics::Image &, unsigned, bool = false);
+	/** Updates the contents of the entire texture from an image.  If storage
+	has not been defined, it will be set to match the image.  In this case the
+	image will be treated as a stack of square layers and its height must be
+	divisible by its width.  Otherwise the image must match the defined
+	storage. */
+	virtual void image(const Graphics::Image &, unsigned = 0);
 
 	using Texture::image;