X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=7ce18d00a9fa075b5df6b2a5ea1dac741411165f;hp=e15f9a33562d1e1527ba3c5d76905db437945c7f;hb=f14516331a9b98b1d9d6c9c4e44787167f87a813;hpb=fcaae0500d5c6fa842babe37450c435e4178547a

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index e15f9a33..7ce18d00 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -95,7 +95,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 		return sub_image(level, 0, 0, w, h, fmt, type, data);
 
 	BindRestore _bind(this);
-	glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
+	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
@@ -113,6 +113,7 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
+	fmt = get_upload_format(fmt);
 	if(ARB_direct_state_access)
 		glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
 	else