X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=7c4b04469d23a0b17961543cf34ff9e21688977a;hp=8b014aee0c262fb811444c1c44a1fba0083df21e;hb=e16855bccb78c721e2fe3f2ea8fc0310e041cb43;hpb=d2efbd8a32efa2a3ee8542efc846277af19d63e0

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 8b014aee..7c4b0446 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,5 +1,9 @@
 #include <cmath>
+#include <msp/core/raii.h>
+#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"
@@ -11,9 +15,16 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Texture3D::Texture3D(GLenum t):
+	Texture(t),
+	width(0),
+	height(0),
+	depth(0),
+	allocated(0)
+{ }
+
 Texture3D::Texture3D():
 	Texture(GL_TEXTURE_3D),
-	ifmt(RGB),
 	width(0),
 	height(0),
 	depth(0),
@@ -22,27 +33,47 @@ 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");
 	if(wd==0 || ht==0 || dp==0)
 		throw invalid_argument("Texture3D::storage");
-	require_pixelformat(fmt);
 
+	set_internal_format(fmt);
 	width = wd;
 	height = ht;
 	depth = dp;
-	ifmt = fmt;
+	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;
 
-	PixelFormat base_fmt = get_base_pixelformat(ifmt);
-	image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	if(ARB_texture_storage)
+	{
+		if(ARB_direct_state_access)
+			glTextureStorage3D(id, levels, ifmt, width, height, depth);
+		else
+		{
+			BindRestore _bind(this);
+			glTexStorage3D(target, levels, ifmt, width, height, depth);
+		}
+		allocated |= (1<<levels)-1;
+	}
+	else
+	{
+		PixelFormat base_fmt = get_base_pixelformat(ifmt);
+		image(level, base_fmt, get_alloc_type(base_fmt), 0);
+	}
 }
 
 void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -55,15 +86,17 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned d = depth;
 	get_level_size(level, w, h, d);
 
+	if(ARB_texture_storage)
+		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);
+	glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
 		auto_generate_mipmap();
-		for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
-		allocated |= (1<<level)-1;
+		allocated |= (1<<get_n_levels())-1;
 	}
 }
 
@@ -72,10 +105,17 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	if(width==0 || height==0 || depth==0)
 		throw invalid_operation("Texture3D::image");
 
+	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	BindRestore _bind(this);
-	glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
+	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();
 }
 
 void Texture3D::load_image(const string &fn, int dp)
@@ -147,7 +187,10 @@ 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);
+	{
+		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, l);
+	}
 	else if(w!=width || h!=height || d!=depth)
 		throw incompatible_data("Texture3D::load_image");
 
@@ -157,11 +200,22 @@ void Texture3D::image(const Graphics::Image &img, bool srgb)
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
+unsigned Texture3D::get_n_levels() const
+{
+	unsigned s = max(width, height);
+	if(target!=GL_TEXTURE_2D_ARRAY)
+		s = max(s, depth);
+	unsigned n = 0;
+	for(; s; s>>=1, ++n) ;
+	return n;
+}
+
+void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) const
 {
 	w >>= level;
 	h >>= level;
-	d >>= level;
+	if(target!=GL_TEXTURE_2D_ARRAY)
+		d >>= level;
 
 	if(!w && (h || d))
 		w = 1;
@@ -202,8 +256,6 @@ 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);
 }