X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=f64f548ad926ef5901f43a775f8da3e3b6427e25;hb=b1c758a602262afad23e28ab68d62021a5b1257e;hp=12fc856b8415d4e9cc18ac95c2a9c548a79cf79f;hpb=e01371d38e290b4c526146fd5d1388bba8201233;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 12fc856b..f64f548a 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,4 +1,7 @@
 #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/graphics/image.h>
 #include "bindable.h"
@@ -53,8 +56,23 @@ void Texture3D::allocate(unsigned level)
 	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)
+	{
+		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+		if(ARB_direct_state_access)
+			glTextureStorage3D(id, n_levels, ifmt, width, height, depth);
+		else
+		{
+			BindRestore _bind(this);
+			glTexStorage3D(target, n_levels, ifmt, width, height, depth);
+		}
+		allocated |= (1<<n_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)
@@ -67,6 +85,9 @@ 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);
 
@@ -83,10 +104,16 @@ 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);
+	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)