X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexture2d.cpp;h=7cad81d92a5e44e2717bbaf88f1c35d166fa8dc3;hb=7d7a8f9e77a526fd5f2920b9005805e56a4b686c;hp=e237e504176ace2bfd56ddf74597907aee397abb;hpb=4d7f66ea28c788e12f700216b9c53af9e71b8390;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index e237e504..7cad81d9 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -74,6 +74,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	allocated |= 1<<level;
 	if(gen_mipmap && level==0)
 	{
+		auto_generate_mipmap();
 		for(; (w || h); w>>=1, h>>=1, ++level) ;
 		allocated |= (1<<level)-1;
 	}
@@ -207,10 +208,7 @@ Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
 	pixel_buffer(PIXEL_UNPACK_BUFFER),
 	mapped_address(0),
 	phase(0)
-{
-	if(!texture.id)
-		glGenTextures(1, &texture.id);
-}
+{ }
 
 bool Texture2D::AsyncLoader::needs_sync() const
 {
@@ -245,6 +243,8 @@ bool Texture2D::AsyncLoader::process()
 			return false;
 		}
 
+		if(!texture.id)
+			glGenTextures(1, &texture.id);
 		texture.image(image, false, true);
 	}