X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=8306324153747078300a9b593d392d78f91cd5a6;hp=19c3bf074b9a3557adf7668c4752f22bda3bcb8c;hb=81e0e39fefd8f50ae2367fe821d58af6273bcea2;hpb=cdf928f03f4d8383b8fa978abc4c255a850ec061

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 19c3bf07..83063241 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -51,7 +51,7 @@ TextureCube::TextureCube():
 	static Require _req(ARB_texture_cube_map);
 }
 
-void TextureCube::storage(PixelFormat fmt, unsigned sz)
+void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
 {
 	if(size>0)
 		throw invalid_operation("TextureCube::storage");
@@ -60,19 +60,25 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz)
 
 	set_internal_format(fmt);
 	size = sz;
+	levels = get_n_levels();
+	if(lv>0)
+		levels = min(levels, lv);
 }
 
 void TextureCube::allocate(unsigned level)
 {
+	if(size==0)
+		throw invalid_operation("TextureCube::allocate");
+	if(level>=levels)
+		throw invalid_argument("TextureCube::allocate");
 	if(allocated&(1<<level))
 		return;
 
 	if(ARB_texture_storage)
 	{
 		BindRestore _bind(this);
-		unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
-		glTexStorage2D(target, n_levels, ifmt, size, size);
-		allocated |= (1<<n_levels)-1;
+		glTexStorage2D(target, levels, ifmt, size, size);
+		allocated |= (1<<levels)-1;
 	}
 	else
 	{
@@ -96,7 +102,7 @@ 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);
-	glTexImage2D(face, level, ifmt, s, s, 0, fmt, type, data);
+	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;
@@ -116,7 +122,7 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 	BindRestore _bind(this);
 	allocate(level);
 
-	glTexSubImage2D(face, level, x, y, wd, ht, fmt, type, data);
+	glTexSubImage2D(face, level, x, y, wd, ht, get_upload_format(fmt), type, data);
 
 	if(gen_mipmap && level==0)
 		auto_generate_mipmap();
@@ -154,7 +160,10 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
 
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(size==0)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+	{
+		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!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
 
@@ -276,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);
 }