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

diff --git a/source/texture3d.h b/source/texture3d.h
index 7847c2fc..08084716 100644
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -24,6 +24,7 @@ public:
 
 		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned, unsigned);
+		void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
 	};
 
 private:
@@ -61,20 +62,6 @@ public:
 		int x, int y, int z, unsigned wd, unsigned ht, unsigned dp,
 		PixelFormat fmt, DataType type, const void *data);
 
-	/** Loads an image from a file and uploads it to the texture.  If storage
-	has not been defined, it will be set to match the loaded image.  To
-	construct a three-dimensional texture from a two-dimensional image, the
-	image is interpreted as an array of consecutive images.  If dp is -1, the
-	texture's width and height are equal.  If dp is -2, the texture's height and
-	depth are equal.  Otherwise, dp must be positive and determines the
-	texture's depth.  In all cases, the image's height must equal the texture's
-	height times its depth.
-	
-	Deprecated in favor of the base class version.*/
-	DEPRECATED void load_image(const std::string &fn, int dp = -1);
-
-	using Texture::load_image;
-
 	/** 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.