X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=f64f548ad926ef5901f43a775f8da3e3b6427e25;hp=36afa9bcdfe9b3fc2dc1e72c5ef8d19bce06f8aa;hb=08e19bc2b4eba572bc7699378cf55cd8772ac67e;hpb=b2c8b2238877f76cdea184cca70336b15ddb78d9

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 36afa9bc..f64f548a 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,4 +1,6 @@
 #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>
@@ -56,9 +58,14 @@ void Texture3D::allocate(unsigned level)
 
 	if(ARB_texture_storage)
 	{
-		BindRestore _bind(this);
 		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
-		glTexStorage3D(target, n_levels, ifmt, width, height, depth);
+		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
@@ -97,10 +104,13 @@ 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");
 
-	BindRestore _bind(this);
+	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	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();