X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=cd18c10d6909a2c459c4b2409789069900a67b88;hp=03e65167d73fee7a1d89ba9ea3cea7ef2c68d81d;hb=85c6c43eb0f937f31f4a91ef3731d8bb2e98c8b4;hpb=40e1eba6c489e11a4c9b8865ddcd3ec3d9f83818

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 03e65167..cd18c10d 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -106,10 +106,10 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 
 	// XXX Allocation should be tracked per-face, but we'll run out of bits
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap==1 && level==0)
 	{
 		// TODO Only do this once all faces are created
-		auto_generate_mipmap();
+		generate_mipmap();
 		allocated |= (1<<get_n_levels())-1;
 	}
 }
@@ -124,8 +124,8 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 
 	glTexSubImage2D(face, level, x, y, wd, ht, get_upload_format(fmt), type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap==1 && level==0)
+		generate_mipmap();
 }
 
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
@@ -285,8 +285,6 @@ void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
 
 void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)
 {
-	if(srgb)
-		fmt = get_srgb_pixelformat(fmt);
 	obj.storage(fmt, s);
 }