X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=85b3f075f5096e47d92800ad734958189d0f0fa1;hb=5c5d094255ae5b0a07f99392a5a099ad9c8e8e38;hp=d04a17e1fbb38bf81c507f9798406f75ca3b2942;hpb=cb836adcf11f690188df9b7bc59f3fe87b67aaa7;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index d04a17e1..85b3f075 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>
@@ -14,7 +16,6 @@ namespace GL {
 
 Texture3D::Texture3D(GLenum t):
 	Texture(t),
-	ifmt(RGB),
 	width(0),
 	height(0),
 	depth(0),
@@ -23,7 +24,6 @@ Texture3D::Texture3D(GLenum t):
 
 Texture3D::Texture3D():
 	Texture(GL_TEXTURE_3D),
-	ifmt(RGB),
 	width(0),
 	height(0),
 	depth(0),
@@ -39,11 +39,7 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
 	if(wd==0 || ht==0 || dp==0)
 		throw invalid_argument("Texture3D::storage");
 
-	if(MSP_sized_internal_formats)
-		fmt = get_sized_pixelformat(fmt);
-	require_pixelformat(fmt);
-
-	ifmt = fmt;
+	set_internal_format(fmt);
 	width = wd;
 	height = ht;
 	depth = dp;
@@ -56,9 +52,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
@@ -78,11 +79,11 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	unsigned d = depth;
 	get_level_size(level, w, h, d);
 
-	BindRestore _bind(this);
 	if(ARB_texture_storage)
-		sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
-	else
-		glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+		return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
+
+	BindRestore _bind(this);
+	glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
@@ -97,10 +98,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)