X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.cpp;h=d88b88c02e57c763d7c3b7731cbb4a159eb430d4;hb=68488043ee491d117477a458f876e0d3f78e146e;hp=7466a9efa2bc0d0fb3ef9b48f2330bb8499b59cf;hpb=40e1eba6c489e11a4c9b8865ddcd3ec3d9f83818;p=libs%2Fgl.git

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index 7466a9ef..d88b88c0 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 && 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 && level==0)
+		generate_mipmap();
 }
 
 void Texture1D::image(const Graphics::Image &img, bool srgb)
@@ -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);
 }