Allow texture mipmap levels to be specified in datafiles

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index c107fd7451a16a6f2f9c5368e065d20442249277..c8f59a094a0fed550a37a5721ae26329941a54ae 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -190,10 +190,7 @@ void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)
-       {
-               unsigned l = (is_mipmapped(min_filter) ? lv : 1);
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, l);
-       }
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, lv);
        else if(w!=width || h!=height || d!=depth)
                throw incompatible_data("Texture3D::load_image");
 
@@ -250,6 +247,7 @@ void Texture3D::Loader::init()
 {
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
+       add("storage", &Loader::storage_levels);
 }
 
 void Texture3D::Loader::raw_data(const string &data)
@@ -262,5 +260,10 @@ void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigne
        obj.storage(fmt, w, h, d);
 }
 
+void Texture3D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned d, unsigned l)
+{
+       obj.storage(fmt, w, h, d, l);
+}
+
 } // namespace GL
 } // namespace Msp