X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexturecube.cpp;h=8d194c42028bb6a4c6eb56cf2e9c0cb9567eba71;hb=73eec11d44a24bac121f1b0d85f20d58005f3545;hp=03e65167d73fee7a1d89ba9ea3cea7ef2c68d81d;hpb=40e1eba6c489e11a4c9b8865ddcd3ec3d9f83818;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 03e65167..8d194c42 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -71,13 +71,14 @@ void TextureCube::allocate(unsigned level)
 		throw invalid_operation("TextureCube::allocate");
 	if(level>=levels)
 		throw invalid_argument("TextureCube::allocate");
-	if(allocated&(1<<level))
+	if(allocated&(64<<level))
 		return;
 
 	if(ARB_texture_storage)
 	{
 		BindRestore _bind(this);
 		glTexStorage2D(target, levels, ifmt, size, size);
+		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
 	else
@@ -102,15 +103,34 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 		return sub_image(face, level, 0, 0, s, s, fmt, type, data);
 
 	BindRestore _bind(this);
+
+	if(!allocated)
+	{
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+		apply_swizzle();
+	}
 	glTexImage2D(face, level, ifmt, s, s, 0, get_upload_format(fmt), type, data);
 
-	// XXX Allocation should be tracked per-face, but we'll run out of bits
-	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(level==0)
 	{
-		// TODO Only do this once all faces are created
-		auto_generate_mipmap();
-		allocated |= (1<<get_n_levels())-1;
+		allocated |= 1<<get_face_index(face);
+		if((allocated&63)==63)
+		{
+			allocated |= 64;
+			if(auto_gen_mipmap)
+			{
+				generate_mipmap();
+				allocated |= (64<<levels)-1;
+			}
+		}
+	}
+	else if(!(allocated&(64<<level)))
+	{
+		for(unsigned i=0; i<6; ++i)
+			if(enumerate_faces(i)!=face)
+				glTexImage2D(enumerate_faces(i), level, ifmt, s, s, 0, get_upload_format(fmt), type, 0);
+
+		allocated |= 64<<level;
 	}
 }
 
@@ -124,8 +144,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 && level==0)
+		generate_mipmap();
 }
 
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
@@ -149,7 +169,7 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool s
 	image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-void TextureCube::image(const Graphics::Image &img, bool srgb)
+void TextureCube::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
@@ -160,10 +180,7 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
 
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(size==0)
-	{
-		unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, l);
-	}
+		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, lv);
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
 
@@ -258,6 +275,7 @@ void TextureCube::Loader::init()
 	add("image_data", &Loader::image_data);
 	add("raw_data", &Loader::raw_data);
 	add("storage", &Loader::storage);
+	add("storage", &Loader::storage_levels);
 }
 
 void TextureCube::Loader::external_image(TextureCubeFace face, const string &fn)
@@ -285,11 +303,14 @@ 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);
 }
 
+void TextureCube::Loader::storage_levels(PixelFormat fmt, unsigned s, unsigned l)
+{
+	obj.storage(fmt, s, l);
+}
+
 
 void operator>>(const LexicalConverter &conv, TextureCubeFace &face)
 {