X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=8d6e8471edb72574340e6e870514bfb652a13113;hp=75b84ec7bbe5747c17ee47b137ba56df33e9101e;hb=3c46227c280bc4cd8a4487c648f2f080d5b4f7ea;hpb=cdf928f03f4d8383b8fa978abc4c255a850ec061

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 75b84ec7..8d6e8471 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -60,6 +60,8 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 
 void Texture2D::allocate(unsigned level)
 {
+	if(width==0 || height==0)
+		throw invalid_operation("Texture2D::allocate");
 	if(allocated&(1<<level))
 		return;
 
@@ -95,7 +97,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 +115,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
@@ -171,7 +174,7 @@ Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res)
 
 UInt64 Texture2D::get_data_size() const
 {
-	return id ? width*height*get_component_count(ifmt) : 0;
+	return id ? width*height*get_pixel_size(ifmt) : 0;
 }
 
 void Texture2D::unload()