X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=7b9c3590ef6bc7eb8e936e20816c36549bbdec2c;hb=7d7a8f9e77a526fd5f2920b9005805e56a4b686c;hp=3d322d4b9bd9c14834097c81773c085e9bda7584;hpb=055f553b1a75f44e72f3c2b5a1c98c1e1e8f3f30;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 3d322d4b..7b9c3590 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -13,6 +13,7 @@ namespace GL {
 
 Texture3D::Texture3D():
 	Texture(GL_TEXTURE_3D),
+	ifmt(RGB),
 	width(0),
 	height(0),
 	depth(0),
@@ -53,12 +54,13 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned d = depth;
 	get_level_size(level, w, h, d);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
+		auto_generate_mipmap();
 		for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
 		allocated |= (1<<level)-1;
 	}
@@ -71,7 +73,7 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 
 	allocate(level);
 
-	Bind _bind(this, true);
+	BindRestore _bind(this);
 	glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
 }
 
@@ -116,7 +118,7 @@ void Texture3D::load_image(const string &fn, int dp)
 		throw incompatible_data("Texture3D::load_image");
 
 	PixelStore pstore = PixelStore::from_image(img);
-	Bind _bind_ps(pstore, true);
+	BindRestore _bind_ps(pstore);
 
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
@@ -135,5 +137,10 @@ void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigne
 		d = 1;
 }
 
+UInt64 Texture3D::get_data_size() const
+{
+	return id ? width*height*depth*get_pixel_size(ifmt) : 0;
+}
+
 } // namespace GL
 } // namespace Msp