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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index c107fd74..03c58d0a 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -40,7 +40,7 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp,
 	if(wd==0 || ht==0 || dp==0)
 		throw invalid_argument("Texture3D::storage");
 
-	set_internal_format(fmt);
+	set_format(fmt);
 	width = wd;
 	height = ht;
 	depth = dp;
@@ -60,23 +60,19 @@ 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);
+			glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
 		else
-		{
-			BindRestore _bind(this);
-			glTexStorage3D(target, levels, ifmt, width, height, depth);
-		}
+			glTexStorage3D(target, levels, storage_fmt, width, height, depth);
+		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
 	else
-	{
-		PixelFormat base_fmt = get_base_pixelformat(ifmt);
-		image(level, base_fmt, get_alloc_type(base_fmt), 0);
-	}
+		image(level, 0);
 }
 
-void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+void Texture3D::image(unsigned level, const void *data)
 {
 	if(width==0 || height==0 || depth==0)
 		throw invalid_operation("Texture3D::image");
@@ -87,13 +83,19 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	get_level_size(level, w, h, d);
 
 	if(ARB_texture_storage)
-		return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
+		return sub_image(level, 0, 0, 0, w, h, d, data);
 
 	BindRestore _bind(this);
 
 	if(!allocated)
+	{
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
-	glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
+		apply_swizzle();
+	}
+
+	PixelComponents comp = get_components(storage_fmt);
+	DataType type = get_component_type(storage_fmt);
+	glTexImage3D(target, level, storage_fmt, width, height, depth, 0, comp, type, data);
 
 	allocated |= 1<<level;
 	if(auto_gen_mipmap && level==0)
@@ -103,7 +105,14 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	}
 }
 
-void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelFormat fmt, DataType type, const void *data)
+void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
+{
+	if(comp!=get_components(format) || type!=get_component_type(format))
+		throw incompatible_data("Texture3D::image");
+	image(level, data);
+}
+
+void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
 {
 	if(width==0 || height==0 || depth==0)
 		throw invalid_operation("Texture3D::image");
@@ -111,96 +120,44 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	fmt = get_upload_format(fmt);
+	PixelComponents comp = get_components(storage_fmt);
+	DataType type = get_component_type(storage_fmt);
 	if(ARB_direct_state_access)
-		glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, fmt, type, data);
+		glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data);
 	else
-		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
+		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
 
 	if(auto_gen_mipmap && level==0)
 		generate_mipmap();
 }
 
-void Texture3D::load_image(const string &fn, int dp)
+void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)
 {
-	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(comp!=get_components(format) || type!=get_component_type(format))
+		throw incompatible_data("Texture3D::sub_image");
+	sub_image(level, x, y, z, wd, ht, dp, data);
 }
 
-void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb)
+void Texture3D::image(const Graphics::Image &img, unsigned lv)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
-	unsigned d = 1;
 
-	if(depth)
-	{
-		if(h%depth)
-			throw incompatible_data("Texture3D::load_image");
-		h /= depth;
-		d = depth;
-	}
-	else
-	{
-		if(h%w)
-			throw incompatible_data("Texture3D::load_image");
-		d = h/w;
-		h = w;
-	}
+	if(h%w)
+		throw incompatible_data("Texture3D::load_image");
+	unsigned d = h/w;
+	h = w;
 
-	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	PixelFormat fmt = pixelformat_from_image(img);
 	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(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, d, lv);
 	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());
+	image(0, img.get_pixels());
 }
 
 unsigned Texture3D::get_n_levels() const
@@ -230,7 +187,7 @@ void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigne
 
 UInt64 Texture3D::get_data_size() const
 {
-	return id ? width*height*depth*get_pixel_size(ifmt) : 0;
+	return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
 }
 
 
@@ -250,11 +207,12 @@ 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)
 {
-	obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+	obj.image(0, data.data());
 }
 
 void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigned d)
@@ -262,5 +220,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