X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.cpp;fp=source%2Fcore%2Ftexture1d.cpp;h=1dbe36eb293e6b02d6a01608b23fb546938eb71a;hb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;hp=feff9f9883f3f1b39921193fd75eb4c4e5effde4;hpb=bea2bcf1aa353b1dd8d1728931ef0508677bd2c6;p=libs%2Fgl.git

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index feff9f98..1dbe36eb 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -42,22 +42,6 @@ void Texture1D::allocate(unsigned level)
 		throw invalid_operation("Texture1D::allocate");
 	if(level>=levels)
 		throw invalid_argument("Texture1D::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 Texture1D::allocate_(unsigned level)
-{
 	if(allocated&(1<<level))
 		return;
 
@@ -67,12 +51,15 @@ void Texture1D::allocate_(unsigned level)
 		if(ARB_direct_state_access)
 			glTextureStorage1D(id, levels, fmt, width);
 		else
+		{
+			bind_scratch();
 			glTexStorage1D(target, levels, fmt, width);
+		}
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
 	else
-		image_(level, 0);
+		image(level, 0);
 }
 
 void Texture1D::image(unsigned level, const void *data)
@@ -85,22 +72,8 @@ void Texture1D::image(unsigned level, const void *data)
 	if(ARB_texture_storage)
 		return sub_image(level, 0, get_level_size(level), 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 Texture1D::image_(unsigned level, const void *data)
-{
 	if(!allocated)
 	{
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
@@ -113,6 +86,11 @@ void Texture1D::image_(unsigned level, const void *data)
 	glTexImage1D(target, level, fmt, get_level_size(level), 0, comp, type, data);
 
 	allocated |= 1<<level;
+	if(auto_gen_mipmap && level==0)
+	{
+		generate_mipmap();
+		allocated |= (1<<levels)-1;
+	}
 }
 
 void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -129,27 +107,20 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
 	if(level>=levels)
 		throw out_of_range("Texture1D::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)
 		glTextureSubImage1D(id, level, x, wd, comp, type, data);
 	else
+	{
+		bind_scratch();
 		glTexSubImage1D(target, level, x, wd, comp, type, data);
+	}
 
 	if(auto_gen_mipmap && level==0)
-		generate_mipmap_();
-
-	if(!direct)
-		glBindTexture(target, 0);
+		generate_mipmap();
 }
 
 void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)