X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.cpp;h=b0887ca85b1e4fca0e88769da87e4621f0d3af54;hb=9087cc0a372b9c739f15398c7a22c0a6eb5041bb;hp=ee8c71c5b0399e88f7c15b375878cf64623a4472;hpb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;p=libs%2Fgl.git

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index ee8c71c5..b0887ca8 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -71,25 +71,26 @@ 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
 	{
-		PixelFormat base_fmt = get_base_pixelformat(ifmt);
-		DataType type = get_alloc_type(base_fmt);
+		PixelComponents comp = get_components(ifmt);
+		DataType type = get_component_type(ifmt);
 		for(unsigned i=0; i<6; ++i)
-			image(enumerate_faces(i), level, base_fmt, type, 0);
+			image(enumerate_faces(i), level, comp, type, 0);
 	}
 }
 
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, DataType type, const void *data)
+void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
 {
 	if(size==0)
 		throw invalid_operation("TextureCube::image");
@@ -99,22 +100,41 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 		throw out_of_range("TextureCube::image");
 
 	if(ARB_texture_storage)
-		return sub_image(face, level, 0, 0, s, s, fmt, type, data);
+		return sub_image(face, level, 0, 0, s, s, comp, type, data);
 
 	BindRestore _bind(this);
-	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(!allocated)
 	{
-		// TODO Only do this once all faces are created
-		auto_generate_mipmap();
-		allocated |= (1<<get_n_levels())-1;
+		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+		apply_swizzle();
+	}
+	glTexImage2D(face, level, ifmt, s, s, 0, get_upload_components(comp), type, data);
+
+	if(level==0)
+	{
+		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, comp, type, 0);
+
+		allocated |= 64<<level;
 	}
 }
 
-void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
 {
 	if(size==0)
 		throw invalid_operation("TextureCube::sub_image");
@@ -122,23 +142,23 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 	BindRestore _bind(this);
 	allocate(level);
 
-	glTexSubImage2D(face, level, x, y, wd, ht, get_upload_format(fmt), type, data);
+	glTexSubImage2D(face, level, x, y, wd, ht, get_upload_components(comp), 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)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
-	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	PixelFormat fmt = pixelformat_from_image(img);
 	if(size==0)
 	{
 		if(w!=h)
 			throw incompatible_data("TextureCube::image");
 
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), srgb), w);
 	}
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
@@ -146,10 +166,10 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool s
 	PixelStore pstore = PixelStore::from_image(img);
 	BindRestore _bind_ps(pstore);
 
-	image(face, 0, fmt, UNSIGNED_BYTE, img.get_data());
+	image(face, 0, get_components(fmt), get_component_type(fmt), 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();
@@ -158,12 +178,11 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
 		throw incompatible_data("TextureCube::image");
 	h /= 6;
 
-	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
+	PixelFormat fmt = pixelformat_from_image(img);
+	PixelComponents comp = get_components(fmt);
+	DataType type = get_component_type(fmt);
 	if(size==0)
-	{
-		unsigned l = (is_mipmapped(min_filter) ? 0 : 1);
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, l);
-	}
+		storage(make_pixelformat(comp, type, srgb), w, lv);
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
 
@@ -173,7 +192,7 @@ void TextureCube::image(const Graphics::Image &img, bool srgb)
 	const char *cdata = reinterpret_cast<const char *>(img.get_data());
 	unsigned face_size = img.get_stride()*size;
 	for(unsigned i=0; i<6; ++i)
-		image(enumerate_faces(i), 0, fmt, UNSIGNED_BYTE, cdata+i*face_size);
+		image(enumerate_faces(i), 0, comp, type, cdata+i*face_size);
 }
 
 unsigned TextureCube::get_n_levels() const
@@ -258,6 +277,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)
@@ -280,16 +300,19 @@ void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
 
 void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
 {
-	obj.image(face, 0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+	obj.image(face, 0, get_components(obj.ifmt), get_component_type(obj.ifmt), data.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)
 {