X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.cpp;h=1c6c4962e46a1a3eb4b0c8817beed3dcfb726b9f;hb=18449fc11c620be7b3115f28a5edfb57eb5985ef;hp=6ec3662523dea02903e024bb9113b91125e4b711;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 6ec36625..1c6c4962 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -54,7 +54,11 @@ TextureCube::TextureCube():
 void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
 {
 	if(size>0)
-		throw invalid_operation("TextureCube::storage");
+	{
+		if(fmt!=format || sz!=size || (lv && lv!=levels))
+			throw incompatible_data("TextureCube::storage");
+		return;
+	}
 	if(sz==0)
 		throw invalid_argument("TextureCube::storage");
 
@@ -79,7 +83,7 @@ void TextureCube::allocate(unsigned level)
 		BindRestore _bind(this);
 		glTexStorage2D(target, levels, storage_fmt, size, size);
 		apply_swizzle();
-		allocated |= (1<<levels)-1;
+		allocated |= (64<<levels)-1;
 	}
 	else
 	{
@@ -109,7 +113,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 	}
 
 	PixelComponents comp = get_components(storage_fmt);
-	DataType type = get_component_type(storage_fmt);
+	GLenum type = get_gl_type(get_component_type(storage_fmt));
 	glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
 
 	if(level==0)
@@ -151,7 +155,7 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 	allocate(level);
 
 	PixelComponents comp = get_components(storage_fmt);
-	DataType type = get_component_type(storage_fmt);
+	GLenum type = get_gl_type(get_component_type(storage_fmt));
 	glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
 
 	if(auto_gen_mipmap && level==0)
@@ -169,17 +173,12 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
-	PixelFormat fmt = pixelformat_from_image(img);
-	if(size==0)
-	{
-		if(w!=h)
-			throw incompatible_data("TextureCube::image");
-
-		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
-	}
-	else if(w!=size || h!=size)
+	if(w!=h)
 		throw incompatible_data("TextureCube::image");
 
+	PixelFormat fmt = pixelformat_from_image(img);
+	storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
+
 	PixelStore pstore = PixelStore::from_image(img);
 	BindRestore _bind_ps(pstore);