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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 680880a8..d22070e6 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -3,6 +3,7 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
+#include <msp/gl/extensions/ext_texture_array.h>
 #include <msp/graphics/image.h>
 #include "bindable.h"
 #include "error.h"
@@ -32,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");
@@ -43,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
 	{
@@ -83,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);
-	glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+
+	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;
 	}
 }
 
@@ -101,13 +113,14 @@ 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);
 	if(ARB_direct_state_access)
 		glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, fmt, type, data);
 	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)
@@ -156,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();
@@ -179,7 +192,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");
 
@@ -236,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)
@@ -245,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