Allow texture mipmap levels to be specified in datafiles

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

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index d09a9570306e077b771d31dce598757e2fc715fb..7163aa7a78d846ed834c32abcdb67fcc99201aa8 100644 (file)
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -110,10 +110,7 @@ void Texture1D::image(const Graphics::Image &img, unsigned lv, bool srgb)
        unsigned w = img.get_width();
        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, l);
-       }
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, lv);
        else if(w!=width)
                throw incompatible_data("Texture1D::image");
 
@@ -154,6 +151,7 @@ void Texture1D::Loader::init()
 {
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
+       add("storage", &Loader::storage_levels);
 }
 
 void Texture1D::Loader::raw_data(const string &data)
@@ -166,5 +164,10 @@ void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
        obj.storage(fmt, w);
 }
 
+void Texture1D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned l)
+{
+       obj.storage(fmt, w, l);
+}
+
 } // namespace GL
 } // namespace Msp