X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Ftexture3d.cpp;h=285abeb957665b3cad558f2caf62d2d29b04166e;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hp=bdb87882e878333c23e88373bc85b57d277c7e74;hpb=a0538cdd026622f7f0f3e2ac1f9c2bd54c4a6014;p=libs%2Fgl.git

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index bdb87882..285abeb9 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -57,22 +57,6 @@ void Texture3D::allocate(unsigned level)
 		throw invalid_operation("Texture3D::allocate");
 	if(level>=levels)
 		throw invalid_argument("Texture3D::allocate");
-
-	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(allocated&(1<<level))
 		return;
 
@@ -82,12 +66,15 @@ void Texture3D::allocate_(unsigned level)
 		if(ARB_direct_state_access)
 			glTextureStorage3D(id, levels, fmt, width, height, depth);
 		else
+		{
+			bind_scratch();
 			glTexStorage3D(target, levels, fmt, width, height, depth);
+		}
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
 	else
-		image_(level, 0);
+		image(level, 0);
 }
 
 void Texture3D::image(unsigned level, const void *data)
@@ -97,35 +84,19 @@ 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);
-
-	image_(level, data);
 
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap_();
-		allocated |= (1<<levels)-1;
-	}
+	bind_scratch();
 
-	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);
 	GLenum fmt = get_gl_pixelformat(storage_fmt);
 	GLenum comp = get_gl_components(get_components(storage_fmt));
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
@@ -148,27 +119,17 @@ 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");
 
-	bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
-	if(!direct)
-	{
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(target, id);
-	}
-
-	allocate_(level);
+	allocate(level);
 
 	GLenum comp = get_gl_components(get_components(storage_fmt));
 	GLenum type = get_gl_type(get_component_type(storage_fmt));
 	if(ARB_direct_state_access)
 		glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, comp, type, data);
 	else
+	{
+		bind_scratch();
 		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
-
-	if(auto_gen_mipmap && level==0)
-		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)
@@ -222,7 +183,7 @@ LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
 	return LinAl::Vector<unsigned, 3>(w, h, d);
 }
 
-UInt64 Texture3D::get_data_size() const
+uint64_t Texture3D::get_data_size() const
 {
 	return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
 }