X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.cpp;h=feff9f9883f3f1b39921193fd75eb4c4e5effde4;hp=4c58d4701639d777b0471b846acc7717d480c90b;hb=33b6ca811172d402fc891eeed9cd2a5edc28d61d;hpb=a60b558e1c327fd2e2600ad2551dc0ac648761f2

diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 4c58d470..feff9f98 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -63,10 +63,11 @@ void Texture1D::allocate_(unsigned level)
 
 	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);
+			glTexStorage1D(target, levels, fmt, width);
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
@@ -106,9 +107,10 @@ void Texture1D::image_(unsigned level, const void *data)
 		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;
 }
@@ -136,7 +138,7 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
 
 	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);