X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;fp=source%2Fcore%2Ftexture2d.cpp;h=9ebc3cc5fc496e0e7afe057f12f26c7796637b10;hp=b5194858b480483ebe5cf45719f41c9502b67d71;hb=33b6ca811172d402fc891eeed9cd2a5edc28d61d;hpb=a60b558e1c327fd2e2600ad2551dc0ac648761f2

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index b5194858..9ebc3cc5 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -91,10 +91,11 @@ void Texture2D::allocate_(unsigned level)
 
 	if(ARB_texture_storage)
 	{
+		GLenum fmt = get_gl_pixelformat(storage_fmt);
 		if(ARB_direct_state_access)
-			glTextureStorage2D(id, levels, storage_fmt, width, height);
+			glTextureStorage2D(id, levels, fmt, width, height);
 		else
-			glTexStorage2D(target, levels, storage_fmt, width, height);
+			glTexStorage2D(target, levels, fmt, width, height);
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
@@ -138,9 +139,10 @@ void Texture2D::image_(unsigned level, const void *data)
 	}
 
 	LinAl::Vector<unsigned, 2> size = get_level_size(level);
-	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));
-	glTexImage2D(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
+	glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data);
 
 	allocated |= 1<<level;
 }
@@ -168,7 +170,7 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 
 	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)
 		glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);