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

diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index b0887ca8..6ec36625 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -58,7 +58,7 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
 	if(sz==0)
 		throw invalid_argument("TextureCube::storage");
 
-	set_internal_format(fmt);
+	set_format(fmt);
 	size = sz;
 	levels = get_n_levels();
 	if(lv>0)
@@ -77,20 +77,18 @@ void TextureCube::allocate(unsigned level)
 	if(ARB_texture_storage)
 	{
 		BindRestore _bind(this);
-		glTexStorage2D(target, levels, ifmt, size, size);
+		glTexStorage2D(target, levels, storage_fmt, size, size);
 		apply_swizzle();
 		allocated |= (1<<levels)-1;
 	}
 	else
 	{
-		PixelComponents comp = get_components(ifmt);
-		DataType type = get_component_type(ifmt);
 		for(unsigned i=0; i<6; ++i)
-			image(enumerate_faces(i), level, comp, type, 0);
+			image(enumerate_faces(i), level, 0);
 	}
 }
 
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
+void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 {
 	if(size==0)
 		throw invalid_operation("TextureCube::image");
@@ -100,7 +98,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents co
 		throw out_of_range("TextureCube::image");
 
 	if(ARB_texture_storage)
-		return sub_image(face, level, 0, 0, s, s, comp, type, data);
+		return sub_image(face, level, 0, 0, s, s, data);
 
 	BindRestore _bind(this);
 
@@ -109,7 +107,10 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents co
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 		apply_swizzle();
 	}
-	glTexImage2D(face, level, ifmt, s, s, 0, get_upload_components(comp), type, data);
+
+	PixelComponents comp = get_components(storage_fmt);
+	DataType type = get_component_type(storage_fmt);
+	glTexImage2D(face, level, storage_fmt, s, s, 0, comp, type, data);
 
 	if(level==0)
 	{
@@ -128,13 +129,20 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents co
 	{
 		for(unsigned i=0; i<6; ++i)
 			if(enumerate_faces(i)!=face)
-				glTexImage2D(enumerate_faces(i), level, ifmt, s, s, 0, comp, type, 0);
+				glTexImage2D(enumerate_faces(i), level, storage_fmt, 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, PixelComponents comp, DataType type, const void *data)
+void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
+{
+	if(comp!=get_components(format) || type!=get_component_type(format))
+		throw incompatible_data("TextureCube::image");
+	image(face, level, data);
+}
+
+void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
 {
 	if(size==0)
 		throw invalid_operation("TextureCube::sub_image");
@@ -142,13 +150,22 @@ 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_components(comp), type, data);
+	PixelComponents comp = get_components(storage_fmt);
+	DataType type = get_component_type(storage_fmt);
+	glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
 
 	if(auto_gen_mipmap && level==0)
 		generate_mipmap();
 }
 
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)
+void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
+{
+	if(comp!=get_components(format) || type!=get_component_type(format))
+		throw incompatible_data("TextureCube::subimage");
+	sub_image(face, level, x, y, wd, ht, data);
+}
+
+void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
@@ -158,7 +175,7 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool s
 		if(w!=h)
 			throw incompatible_data("TextureCube::image");
 
-		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), srgb), w);
+		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w);
 	}
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
@@ -166,10 +183,15 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool s
 	PixelStore pstore = PixelStore::from_image(img);
 	BindRestore _bind_ps(pstore);
 
-	image(face, 0, get_components(fmt), get_component_type(fmt), img.get_data());
+	image(face, 0, img.get_pixels());
+}
+
+void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool)
+{
+	image(face, img);
 }
 
-void TextureCube::image(const Graphics::Image &img, unsigned lv, bool srgb)
+void TextureCube::image(const Graphics::Image &img, unsigned lv)
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
@@ -179,20 +201,18 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv, bool srgb)
 	h /= 6;
 
 	PixelFormat fmt = pixelformat_from_image(img);
-	PixelComponents comp = get_components(fmt);
-	DataType type = get_component_type(fmt);
 	if(size==0)
-		storage(make_pixelformat(comp, type, srgb), w, lv);
+		storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, lv);
 	else if(w!=size || h!=size)
 		throw incompatible_data("TextureCube::image");
 
 	PixelStore pstore = PixelStore::from_image(img);
 	BindRestore _bind_ps(pstore);
 
-	const char *cdata = reinterpret_cast<const char *>(img.get_data());
+	const char *pixels = reinterpret_cast<const char *>(img.get_pixels());
 	unsigned face_size = img.get_stride()*size;
 	for(unsigned i=0; i<6; ++i)
-		image(enumerate_faces(i), 0, comp, type, cdata+i*face_size);
+		image(enumerate_faces(i), 0, pixels+i*face_size);
 }
 
 unsigned TextureCube::get_n_levels() const
@@ -255,7 +275,7 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
 
 UInt64 TextureCube::get_data_size() const
 {
-	return id ? size*size*6*get_pixel_size(ifmt) : 0;
+	return id ? size*size*6*get_pixel_size(storage_fmt) : 0;
 }
 
 
@@ -286,7 +306,7 @@ void TextureCube::Loader::external_image(TextureCubeFace face, const string &fn)
 	RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
 	img.load_io(*io);
 
-	obj.image(face, img, srgb);
+	obj.image(face, img);
 }
 
 void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
@@ -295,12 +315,12 @@ void TextureCube::Loader::image_data(TextureCubeFace face, const string &data)
 	IO::Memory mem(data.data(), data.size());
 	img.load_io(mem);
 
-	obj.image(face, img, srgb);
+	obj.image(face, img);
 }
 
 void TextureCube::Loader::raw_data(TextureCubeFace face, const string &data)
 {
-	obj.image(face, 0, get_components(obj.ifmt), get_component_type(obj.ifmt), data.data());
+	obj.image(face, 0, data.data());
 }
 
 void TextureCube::Loader::storage(PixelFormat fmt, unsigned s)