X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture.cpp;h=ab5700482ce02484efb7b960df00a9b3a95a0908;hp=24994f7c69d0022be6e78230350c8ade6ffcc393;hb=635e5dc;hpb=d0a888978ab0c2226ed5961c736c7cac551e79b1

diff --git a/source/texture.cpp b/source/texture.cpp
index 24994f7c..ab570048 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -193,22 +193,22 @@ void Texture::set_compare_func(Predicate f)
 	default_sampler.set_compare(f);
 }
 
-void Texture::load_image(const string &fn, bool srgb)
+void Texture::load_image(const string &fn, bool)
 {
-	load_image(fn, 0, srgb);
+	load_image(fn, 0U);
 }
 
-void Texture::load_image(const string &fn, unsigned lv, bool srgb)
+void Texture::load_image(const string &fn, unsigned lv)
 {
 	Graphics::Image img;
 	img.load_file(fn);
 
-	image(img, lv, srgb);
+	image(img, lv);
 }
 
-void Texture::image(const Graphics::Image &img, bool srgb)
+void Texture::image(const Graphics::Image &img, bool)
 {
-	image(img, 0, srgb);
+	image(img, 0U);
 }
 
 void Texture::bind_to(unsigned i) const
@@ -279,12 +279,9 @@ Texture::Loader::Loader(Texture &t, Collection &c):
 void Texture::Loader::init()
 {
 	levels = 0;
-	if(Resources *res = dynamic_cast<Resources *>(coll))
-		srgb = res->get_srgb_conversion();
-	else
-		srgb = false;
 
 	add("external_image", &Loader::external_image);
+	add("external_image_srgb", &Loader::external_image);
 	add("filter", &Loader::filter);
 	add("generate_mipmap", &Loader::generate_mipmap);
 	add("image_data", &Loader::image_data);
@@ -315,6 +312,18 @@ void Texture::Loader::load_external_image(Graphics::Image &img, const std::strin
 }
 
 void Texture::Loader::external_image(const string &fn)
+{
+	obj.use_srgb_format = false;
+	external_image_common(fn);
+}
+
+void Texture::Loader::external_image_srgb(const string &fn)
+{
+	obj.use_srgb_format = true;
+	external_image_common(fn);
+}
+
+void Texture::Loader::external_image_common(const string &fn)
 {
 	if(obj.manager)
 		obj.manager->set_resource_location(obj, get_collection(), fn);
@@ -322,7 +331,7 @@ void Texture::Loader::external_image(const string &fn)
 	{
 		Graphics::Image img;
 		load_external_image(img, fn);
-		obj.image(img, get_levels(), srgb);
+		obj.image(img, get_levels());
 	}
 }
 
@@ -342,7 +351,7 @@ void Texture::Loader::image_data(const string &data)
 	IO::Memory mem(data.data(), data.size());
 	img.load_io(mem);
 
-	obj.image(img, get_levels(), srgb);
+	obj.image(img, get_levels());
 }
 
 void Texture::Loader::mag_filter(TextureFilter f)