X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.h;h=679b6a50ee609175c4725e4998a7aa5538b4f6bf;hb=66181b3f47322ffc9b8aebf04a8c222abe1a75a2;hp=55a0e3dbe8ec4ce214bdc56f5532655160965b58;hpb=55dbeb5e04516699b8415104e346243d5e4c48c9;p=libs%2Fgl.git

diff --git a/source/texture3d.h b/source/texture3d.h
index 55a0e3db..679b6a50 100644
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -27,10 +27,10 @@ public:
 	};
 
 private:
-	PixelFormat ifmt;
 	unsigned width;
 	unsigned height;
 	unsigned depth;
+	unsigned levels;
 	unsigned allocated;
 
 protected:
@@ -38,9 +38,12 @@ protected:
 public:
 	Texture3D();
 
-	/** Defines storage structure for the texture.  Must be called before an
-	image can be uploaded.  Once storage is defined, it can't be changed. */
-	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp);
+	/** Defines storage structure for the texture.  If lv is zero, the number
+	of mipmap levels is automatically determined from storage dimensions.
+
+	Must be called before an image can be uploaded.  Once storage is defined,
+	it can't be changed. */
+	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv = 0);
 
 	/** Allocates storage for the texture.  The contents are initially
 	undefined.  If storage has already been allocated, does nothing. */
@@ -68,7 +71,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;
 
@@ -85,7 +88,8 @@ public:
 	unsigned get_height() const { return height; }
 	unsigned get_depth() const { return depth; }
 protected:
-	void get_level_size(unsigned, unsigned &, unsigned &, unsigned &);
+	unsigned get_n_levels() const;
+	void get_level_size(unsigned, unsigned &, unsigned &, unsigned &) const;
 
 public:
 	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }