X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;fp=source%2Fcore%2Ftexture2d.cpp;h=0fc300e0a09e7b4659aefe3bb842228797f6f3b1;hb=4e9fe48180c7b4646ac2591e172de61f7a693b32;hp=ed0b206c1e05069ada3d8e677c84995b706e920b;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;p=libs%2Fgl.git

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index ed0b206c..0fc300e0 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -116,11 +116,6 @@ void Texture2D::image(unsigned level, const void *data)
 	glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
 }
 
 void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -148,9 +143,6 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 		bind_scratch();
 		glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
 	}
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
 }
 
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
@@ -303,6 +295,8 @@ bool Texture2D::AsyncLoader::process()
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id());
 		texture.image(image, 0, true);
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+		if(texture.auto_gen_mipmap)
+			texture.generate_mipmap();
 	}
 
 	++phase;