Deprecate the mipmap_levels parameter in Texture

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 971d3f165393fd00ec631bd3620740111b3bfae5..c107fd7451a16a6f2f9c5368e065d20442249277 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -90,13 +90,16 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
                return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
 
        BindRestore _bind(this);
+
+       if(!allocated)
+               glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
        glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
        allocated |= 1<<level;
        if(auto_gen_mipmap && level==0)
        {
                generate_mipmap();
-               allocated |= (1<<get_n_levels())-1;
+               allocated |= (1<<levels)-1;
        }
 }
 
@@ -164,7 +167,7 @@ void Texture3D::load_image(const string &fn, int dp)
        image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-void Texture3D::image(const Graphics::Image &img, bool srgb)
+void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
        unsigned w = img.get_width();
        unsigned h = img.get_height();
@@ -188,7 +191,7 @@ void Texture3D::image(const Graphics::Image &img, bool srgb)
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)
        {
-               unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+               unsigned l = (is_mipmapped(min_filter) ? lv : 1);
                storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, l);
        }
        else if(w!=width || h!=height || d!=depth)