X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=5c09f1ea4249919bf526703365c730c48b11d4e7;hb=a8a04ddd95e57a8f103c04dba317addc32866689;hp=4cba3afccbfade39750ef6ec00cd890182142b58;hpb=3e17c84968553e58cb09d397cafaead82e51d478;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 4cba3afc..5c09f1ea 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -33,7 +33,7 @@ Texture3D::Texture3D():
 	static Require _req(EXT_texture3D);
 }
 
-void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
+void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv)
 {
 	if(width>0)
 		throw invalid_operation("Texture3D::storage");
@@ -44,24 +44,29 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 	width = wd;
 	height = ht;
 	depth = dp;
+	levels = get_n_levels();
+	if(lv>0)
+		levels = min(levels, lv);
 }
 
 void Texture3D::allocate(unsigned level)
 {
+	if(width==0 || height==0 || depth==0)
+		throw invalid_operation("Texture3D::allocate");
+	if(level>=levels)
+		throw invalid_argument("Texture3D::allocate");
 	if(allocated&(1<<level))
 		return;
 
 	if(ARB_texture_storage)
 	{
-		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 		if(ARB_direct_state_access)
-			glTextureStorage3D(id, n_levels, ifmt, width, height, depth);
+			glTextureStorage3D(id, levels, ifmt, width, height, depth);
 		else
-		{
-			BindRestore _bind(this);
-			glTexStorage3D(target, n_levels, ifmt, width, height, depth);
-		}
-		allocated |= (1<<n_levels)-1;
+			glTexStorage3D(target, levels, ifmt, width, height, depth);
+		apply_swizzle();
+		allocated |= (1<<levels)-1;
 	}
 	else
 	{
@@ -84,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;
 	}
 }
 
@@ -108,57 +119,11 @@ 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();
-}
-
-void Texture3D::load_image(const string &fn, int dp)
-{
-	Graphics::Image img;
-	img.load_file(fn);
-
-	unsigned w = img.get_width();
-	unsigned h = img.get_height();
-	unsigned d = 1;
-
-	if(dp==-1)
-	{
-		if(h%w)
-			throw incompatible_data("Texture3D::load_image");
-		d = h/w;
-		h = w;
-	}
-	else if(dp==-2)
-	{
-		for(d=h; d*d>h; d>>=2) ;
-		for(; d*d<h; ++d) ;
-		if(d*d!=h)
-			throw incompatible_data("Texture3D::load_image");
-		h = d;
-	}
-	else if(dp>0)
-	{
-		d = dp;
-		if(h%d)
-			throw incompatible_data("Texture3D::load_image");
-		h /= d;
-	}
-	else
-		throw invalid_argument("Texture3D::load_image");
-
-	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
-	if(width==0)
-		storage(storage_pixelformat_from_graphics(img.get_format()), w, h, d);
-	else if(w!=width || h!=height || d!=depth)
-		throw incompatible_data("Texture3D::load_image");
-
-	PixelStore pstore = PixelStore::from_image(img);
-	BindRestore _bind_ps(pstore);
-
-	image(0, fmt, UNSIGNED_BYTE, img.get_data());
+	if(auto_gen_mipmap && level==0)
+		generate_mipmap();
 }
 
-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();
@@ -181,7 +146,7 @@ void Texture3D::image(const Graphics::Image &img, bool srgb)
 
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d);
+		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");
 
@@ -238,6 +203,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)
@@ -247,10 +213,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