Honor the srgb conversion flag when loading textures asynchronously

diff --git a/source/resources.cpp b/source/resources.cpp
index afb84b27ae8689612ea068a9289cbb61a92910b6..61d05c9b3d831867e8b36af2f1f8cb70bb916c58 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -93,7 +93,6 @@ Texture2D *Resources::create_texture2d(const string &name)
                        tex->set_mag_filter(default_tex_filter);
                tex->set_min_filter(default_tex_filter);
 
-               // TODO Somehow pass the srgb flag if a resource manager is in use
                if(resource_manager)
                        resource_manager->set_resource_location(*tex, *this, name);
                else

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 28b07bfe614761cc800ede69abc237d40fb844e2..41763586c7dcfc9e81572907b44d00069e5dbf70 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -16,6 +16,7 @@ class Texture2D::AsyncLoader: public Resource::AsyncLoader
 private:
        Texture2D &texture;
        IO::Seekable &io;
+       bool srgb_conversion;
        Buffer pixel_buffer;
        char *mapped_address;
        Graphics::Image image;
@@ -25,6 +26,7 @@ private:
 public:
        AsyncLoader(Texture2D &, IO::Seekable &);
 
+       void set_srgb_conversion(bool);
        virtual bool needs_sync() const;
        virtual bool process();
 };
@@ -136,9 +138,12 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
                h = 1;
 }
 
-Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
+Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res)
 {
-       return new AsyncLoader(*this, io);
+       AsyncLoader *ldr = new AsyncLoader(*this, io);
+       if(res)
+               ldr->set_srgb_conversion(res->get_srgb_conversion());
+       return ldr;
 }
 
 UInt64 Texture2D::get_data_size() const
@@ -205,11 +210,17 @@ void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsig
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
        texture(t),
        io(i),
+       srgb_conversion(false),
        pixel_buffer(PIXEL_UNPACK_BUFFER),
        mapped_address(0),
        phase(0)
 { }
 
+void Texture2D::AsyncLoader::set_srgb_conversion(bool c)
+{
+       srgb_conversion = c;
+}
+
 bool Texture2D::AsyncLoader::needs_sync() const
 {
        return phase%2;
@@ -245,7 +256,7 @@ bool Texture2D::AsyncLoader::process()
 
                if(!texture.id)
                        glGenTextures(1, &texture.id);
-               texture.image(image, false, true);
+               texture.image(image, srgb_conversion, true);
        }
 
        ++phase;