X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=8846a555d6437f6554c46e316a6f40be0b1c9728;hp=559167f8ba4d5eefc017e6e158d76dec55127cf6;hb=9087cc0;hpb=a8a04ddd95e57a8f103c04dba317addc32866689

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 559167f8..8846a555 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -81,13 +81,10 @@ void Texture2D::allocate(unsigned level)
 		allocated |= (1<<levels)-1;
 	}
 	else
-	{
-		PixelFormat base_fmt = get_base_pixelformat(ifmt);
-		image(level, base_fmt, get_alloc_type(base_fmt), 0);
-	}
+		image(level, get_components(ifmt), get_component_type(ifmt), 0);
 }
 
-void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
 {
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::image");
@@ -97,7 +94,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	get_level_size(level, w, h);
 
 	if(ARB_texture_storage)
-		return sub_image(level, 0, 0, w, h, fmt, type, data);
+		return sub_image(level, 0, 0, w, h, comp, type, data);
 
 	BindRestore _bind(this);
 
@@ -106,7 +103,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 		glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
 		apply_swizzle();
 	}
-	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
+	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_components(comp), type, data);
 
 	allocated |= 1<<level;
 	if(auto_gen_mipmap && level==0)
@@ -116,7 +113,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	}
 }
 
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data)
+void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
 {
 	if(width==0 || height==0)
 		throw invalid_operation("Texture2D::sub_image");
@@ -124,11 +121,11 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
 	allocate(level);
 
-	fmt = get_upload_format(fmt);
+	comp = get_upload_components(comp);
 	if(ARB_direct_state_access)
-		glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
+		glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data);
 	else
-		glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+		glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
 
 	if(auto_gen_mipmap && level==0)
 		generate_mipmap();
@@ -143,16 +140,18 @@ void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb, bool f
 {
 	unsigned w = img.get_width();
 	unsigned h = img.get_height();
-	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(width==0)
-		storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, lv);
+		storage(make_pixelformat(comp, type, srgb), w, h, lv);
 	else if(w!=width || h!=height || (lv && lv!=levels))
 		throw incompatible_data("Texture2D::image");
 
 	PixelStore pstore = PixelStore::from_image(img);
 	BindRestore _bind_ps(pstore);
 
-	image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
+	image(0, comp, type, from_buffer ? 0 : img.get_data());
 }
 
 unsigned Texture2D::get_n_levels() const
@@ -216,7 +215,7 @@ void Texture2D::Loader::init()
 
 void Texture2D::Loader::raw_data(const string &data)
 {
-	obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data());
+	obj.image(0, get_components(obj.ifmt), get_component_type(obj.ifmt), data.data());
 }
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)