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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index c107fd74..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
@@ -92,7 +91,10 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	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;
@@ -190,10 +192,7 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-	{
-		unsigned l = (is_mipmapped(min_filter) ? lv : 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");
 
@@ -250,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)
@@ -262,5 +262,10 @@ void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigne
 	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