X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=36afa9bcdfe9b3fc2dc1e72c5ef8d19bce06f8aa;hb=9b430dbef4f58a862320ebfcef7d1f8bff28b0dc;hp=d04a17e1fbb38bf81c507f9798406f75ca3b2942;hpb=cb836adcf11f690188df9b7bc59f3fe87b67aaa7;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index d04a17e1..36afa9bc 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -78,11 +78,11 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned d = depth;
 	get_level_size(level, w, h, d);
 
-	BindRestore _bind(this);
 	if(ARB_texture_storage)
-		sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
-	else
-		glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+		return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
+
+	BindRestore _bind(this);
+	glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
@@ -97,10 +97,13 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	if(width==0 || height==0 || depth==0)
 		throw invalid_operation("Texture3D::image");
 
+	BindRestore _bind(this);
 	allocate(level);
 
-	BindRestore _bind(this);
 	glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
+
+	if(gen_mipmap && level==0)
+		auto_generate_mipmap();
 }
 
 void Texture3D::load_image(const string &fn, int dp)