X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.cpp;h=03e02159a5b8dd49e6847366cd37c8e4d56d8e19;hb=4e9fe48180c7b4646ac2591e172de61f7a693b32;hp=7685d39e99abaeca025ae1c4750b6a53903ff08a;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;p=libs%2Fgl.git

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 7685d39e..03e02159 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -2,7 +2,6 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/msp_texture1d.h>
-#include "bindable.h"
 #include "error.h"
 #include "texture1d.h"
 
@@ -43,36 +42,24 @@ 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;
 
 	if(ARB_texture_storage)
 	{
+		GLenum fmt = get_gl_pixelformat(storage_fmt);
 		if(ARB_direct_state_access)
-			glTextureStorage1D(id, levels, storage_fmt, width);
+			glTextureStorage1D(id, levels, fmt, width);
 		else
-			glTexStorage1D(target, levels, storage_fmt, width);
+		{
+			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,31 +72,18 @@ 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);
+	bind_scratch();
 
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap_();
-		allocated |= (1<<levels)-1;
-	}
-
-	glBindTexture(target, 0);
-}
-
-void Texture1D::image_(unsigned level, const void *data)
-{
 	if(!allocated)
 	{
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 		apply_swizzle();
 	}
 
-	PixelComponents comp = get_components(storage_fmt);
+	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));
-	glTexImage1D(target, level, storage_fmt, get_level_size(level), 0, comp, type, data);
+	glTexImage1D(target, level, fmt, get_level_size(level), 0, comp, type, data);
 
 	allocated |= 1<<level;
 }
@@ -128,27 +102,17 @@ 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);
-
-	PixelComponents comp = get_components(storage_fmt);
+	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);
+	}
 }
 
 void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)