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 85f5fb5836ebdcdb56af17191343a9c2f21be9ea..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),
@@ -122,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());