X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexture3d.h;h=ce63a55ed04d9755d1087b93bc1508b8fdcc5723;hb=fb5ca4dbba257d3eb7fa15800d9663b774e41e7e;hp=437c852ab92f943ed569de54eb4c61f6b34402bf;hpb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;p=libs%2Fgl.git

diff --git a/source/texture3d.h b/source/texture3d.h
index 437c852a..ce63a55e 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:
@@ -71,7 +72,7 @@ public:
 	height times its depth.
 	
 	Deprecated in favor of the base class version.*/
-	void load_image(const std::string &fn, int dp = -1);
+	DEPRECATED void load_image(const std::string &fn, int dp = -1);
 
 	using Texture::load_image;
 
@@ -82,7 +83,9 @@ public:
 
 	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 &, bool = false);
+	virtual void image(const Graphics::Image &, unsigned, bool = false);
+
+	using Texture::image;
 
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }