Always delay texture creation until it is allocated

[libs/gl.git] / source / core / texture.cpp

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index 4968e2e678bd6103c239103828cc1c78b0ff4b2b..be825e7ff231f118356897dcc6036365c178be32 100644 (file)
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -9,7 +9,7 @@ namespace Msp {
 namespace GL {
 
 Texture::Texture(unsigned t, ResourceManager *m):
-       TextureBackend(t, !m),
+       TextureBackend(t),
        format(NO_PIXELFORMAT),
        storage_fmt(format),
        swizzle(NO_SWIZZLE),
@@ -65,22 +65,10 @@ void Texture::load_image(const string &fn, unsigned lv)
 }
 
 
-Texture::Loader::Loader(Texture &t):
-       DataFile::CollectionObjectLoader<Texture>(t, 0)
+Texture::Loader::Loader(Texture &t, Collection *c):
+       CollectionObjectLoader<Texture>(t, c),
+       levels(0)
 {
-       init();
-}
-
-Texture::Loader::Loader(Texture &t, Collection &c):
-       DataFile::CollectionObjectLoader<Texture>(t, &c)
-{
-       init();
-}
-
-void Texture::Loader::init()
-{
-       levels = 0;
-
        add("external_image", &Loader::external_image);
        add("external_image_srgb", &Loader::external_image_srgb);
        add("generate_mipmap", &Loader::generate_mipmap);
@@ -134,11 +122,7 @@ void Texture::Loader::generate_mipmap(bool gm)
 void Texture::Loader::image_data(const string &data)
 {
        if(obj.manager)
-       {
                obj.set_manager(0);
-               if(!obj.id)
-                       obj.generate_id();
-       }
 
        Graphics::Image img;
        IO::Memory mem(data.data(), data.size());