X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture3d.h;h=437c852ab92f943ed569de54eb4c61f6b34402bf;hp=75ae0fe902acb1eb8974591df86b67c9505e5fb3;hb=22ed49c0b233566fc5d72b7c9769fd3ba543ab40;hpb=d2efbd8a32efa2a3ee8542efc846277af19d63e0

diff --git a/source/texture3d.h b/source/texture3d.h
index 75ae0fe9..437c852a 100644
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -27,18 +27,23 @@ public:
 	};
 
 private:
-	PixelFormat ifmt;
 	unsigned width;
 	unsigned height;
 	unsigned depth;
+	unsigned levels;
 	unsigned allocated;
 
+protected:
+	Texture3D(GLenum);
 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. */
@@ -82,8 +87,9 @@ public:
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
 	unsigned get_depth() const { return depth; }
-private:
-	void get_level_size(unsigned, unsigned &, unsigned &, unsigned &);
+protected:
+	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; }