X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexture3d.cpp;h=d22070e680e9d67272a0a7e47d71ffd8aa1a7233;hb=73eec11d44a24bac121f1b0d85f20d58005f3545;hp=36fdfa0f3b8f6b591fd19b7f4d4047fa45c0ba06;hpb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 36fdfa0f..d22070e6 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -60,13 +60,12 @@ void Texture3D::allocate(unsigned level)
 
 	if(ARB_texture_storage)
 	{
+		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 		if(ARB_direct_state_access)
 			glTextureStorage3D(id, levels, ifmt, width, height, depth);
 		else
-		{
-			BindRestore _bind(this);
 			glTexStorage3D(target, levels, ifmt, width, height, depth);
-		}
+		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
 	else
@@ -90,13 +89,19 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 		return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
 
 	BindRestore _bind(this);
+
+	if(!allocated)
+	{
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+		apply_swizzle();
+	}
 	glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap && level==0)
 	{
-		auto_generate_mipmap();
-		allocated |= (1<<get_n_levels())-1;
+		generate_mipmap();
+		allocated |= (1<<levels)-1;
 	}
 }
 
@@ -114,8 +119,8 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	else
 		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap && level==0)
+		generate_mipmap();
 }
 
 void Texture3D::load_image(const string &fn, int dp)
@@ -164,7 +169,7 @@ void Texture3D::load_image(const string &fn, int dp)
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-void Texture3D::image(const Graphics::Image &img, bool srgb)
+void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
@@ -187,10 +192,7 @@ void Texture3D::image(const Graphics::Image &img, bool srgb)
 
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-	{
-		unsigned l = (is_mipmapped(min_filter) ? 0 : 1);
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, l);
-	}
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, lv);
 	else if(w!=width || h!=height || d!=depth)
 		throw incompatible_data("Texture3D::load_image");
 
@@ -247,6 +249,7 @@ void Texture3D::Loader::init()
 {
 	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
+	add("storage", &Loader::storage_levels);
 }
 
 void Texture3D::Loader::raw_data(const string &data)
@@ -256,10 +259,13 @@ void Texture3D::Loader::raw_data(const string &data)
 
 void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w, h, d);
 }
 
+void Texture3D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned d, unsigned l)
+{
+	obj.storage(fmt, w, h, d, l);
+}
+
 } // namespace GL
 } // namespace Msp