X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=dac671fdfa52fcae265d088b2cb9d14f918a9a56;hb=5bc9c7214feaf4ea4797fc0d4a906e5e59b75839;hp=44ee6406420e85f261c988f5e8b14f678c90cfe3;hpb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 44ee6406..dac671fd 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -104,9 +104,9 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap && level==0)
 	{
-		auto_generate_mipmap();
+		generate_mipmap();
 		allocated |= (1<<get_n_levels())-1;
 	}
 }
@@ -125,8 +125,8 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	else
 		glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap && level==0)
+		generate_mipmap();
 }
 
 void Texture2D::image(const Graphics::Image &img, bool srgb)
@@ -141,7 +141,7 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
 	{
-		unsigned l = (is_mipmapped(min_filter) ? 0 : 1);
+		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
 		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, l);
 	}
 	else if(w!=width || h!=height)
@@ -218,8 +218,6 @@ void Texture2D::Loader::raw_data(const string &data)
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w, h);
 }
 
@@ -254,8 +252,8 @@ bool Texture2D::AsyncLoader::process()
 	}
 	else if(phase==1)
 	{
-		pixel_buffer.data(n_bytes, 0);
-		mapped_address = reinterpret_cast<char *>(pixel_buffer.map(WRITE_ONLY));
+		pixel_buffer.storage(n_bytes);
+		mapped_address = reinterpret_cast<char *>(pixel_buffer.map());
 	}
 	else if(phase==2)
 	{