Clear manager in destructors of individual resource classes

[libs/gl.git] / source / texture2d.cpp

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index e237e504176ace2bfd56ddf74597907aee397abb..de75420973134b3d0aa1d2e2275365778b407915 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();
 };
@@ -38,6 +40,11 @@ Texture2D::Texture2D(ResourceManager *m):
        allocated(0)
 { }
 
+Texture2D::~Texture2D()
+{
+       set_manager(0);
+}
+
 void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 {
        if(width>0)
@@ -74,6 +81,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
        {
+               auto_generate_mipmap();
                for(; (w || h); w>>=1, h>>=1, ++level) ;
                allocated |= (1<<level)-1;
        }
@@ -135,9 +143,12 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
                h = 1;
 }
 
-Resource::AsyncLoader *Texture2D::load(IO::Seekable &io)
+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
@@ -204,12 +215,15 @@ 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)
 {
-       if(!texture.id)
-               glGenTextures(1, &texture.id);
+       srgb_conversion = c;
 }
 
 bool Texture2D::AsyncLoader::needs_sync() const
@@ -245,7 +259,9 @@ bool Texture2D::AsyncLoader::process()
                        return false;
                }
 
-               texture.image(image, false, true);
+               if(!texture.id)
+                       glGenTextures(1, &texture.id);
+               texture.image(image, srgb_conversion, true);
        }
 
        ++phase;