X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture3d.cpp;fp=source%2Fcore%2Ftexture3d.cpp;h=3c675dbb705847527586b452f414bdc4b49c1fb1;hb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;hp=f6268d697d6d60c00735c6230e6ff6c701eb8b7c;hpb=a482029babea3210840d8c62e9df9ece4342b2b9;p=libs%2Fgl.git

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index f6268d69..3c675dbb 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -62,9 +62,23 @@ void Texture3D::allocate(unsigned level)
 	if(allocated&(1<<level))
 		return;
 
+	bool direct = ARB_texture_storage && ARB_direct_state_access;
+	if(!direct)
+	{
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(target, id);
+	}
+
+	allocate_(level);
+
+	if(!direct)
+		glBindTexture(target, 0);
+}
+
+void Texture3D::allocate_(unsigned level)
+{
 	if(ARB_texture_storage)
 	{
-		Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 		if(ARB_direct_state_access)
 			glTextureStorage3D(id, levels, storage_fmt, width, height, depth);
 		else
@@ -73,7 +87,7 @@ void Texture3D::allocate(unsigned level)
 		allocated |= (1<<levels)-1;
 	}
 	else
-		image(level, 0);
+		image_(level, 0);
 }
 
 void Texture3D::image(unsigned level, const void *data)
@@ -83,29 +97,40 @@ void Texture3D::image(unsigned level, const void *data)
 	if(level>=levels)
 		throw out_of_range("Texture3D::image");
 
-	LinAl::Vector<unsigned, 3> size = get_level_size(level);
-
 	if(ARB_texture_storage)
+	{
+		LinAl::Vector<unsigned, 3> size = get_level_size(level);
 		return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
+	}
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(target, id);
 
-	BindRestore _bind(this);
+	image_(level, data);
 
+	if(auto_gen_mipmap && level==0)
+	{
+		generate_mipmap_();
+		allocated |= (1<<levels)-1;
+	}
+
+	glBindTexture(target, 0);
+}
+
+void Texture3D::image_(unsigned level, const void *data)
+{
 	if(!allocated)
 	{
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 		apply_swizzle();
 	}
 
+	LinAl::Vector<unsigned, 3> size = get_level_size(level);
 	PixelComponents comp = get_components(storage_fmt);
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
 	glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
 }
 
 void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -122,8 +147,14 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	if(level>=levels)
 		throw out_of_range("Texture3D::sub_image");
 
-	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
-	allocate(level);
+	bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
+	if(!direct)
+	{
+		glActiveTexture(GL_TEXTURE0);
+		glBindTexture(target, id);
+	}
+
+	allocate_(level);
 
 	PixelComponents comp = get_components(storage_fmt);
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
@@ -133,7 +164,10 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
 
 	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
+		generate_mipmap_();
+
+	if(!direct)
+		glBindTexture(target, 0);
 }
 
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)