X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=39782efd8124d357e5bacdb88278309ea578d2b3;hb=d6f8db673345501a29231890b52cbdfce4a8ecf8;hp=a1ee418b22381a27916c407a6d8050459c02ddb0;hpb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;p=libs%2Fgl.git

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index a1ee418b..39782efd 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -74,9 +74,9 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap==1 && level==0)
 	{
-		auto_generate_mipmap();
+		generate_mipmap();
 		allocated |= (1<<get_n_levels())-1;
 	}
 }
@@ -95,8 +95,8 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
 	else
 		glTexSubImage1D(target, level, x, wd, fmt, type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap==1 && level==0)
+		generate_mipmap();
 }
 
 void Texture1D::image(const Graphics::Image &img, bool srgb)
@@ -108,7 +108,7 @@ void Texture1D::image(const Graphics::Image &img, bool srgb)
 	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, l);
 	}
 	else if(w!=width)
@@ -160,8 +160,6 @@ void Texture1D::Loader::raw_data(const string &data)
 
 void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, w);
 }