Deprecate the mipmap_levels parameter in Texture

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 47e0c7434d0ef56c7fbf892b0ee45a31f4552710..7586862591675534a50bf13b076021701ec004b0 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -101,13 +101,16 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
                return sub_image(level, 0, 0, w, h, fmt, type, data);
 
        BindRestore _bind(this);
+
+       if(!allocated)
+               glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
        glTexImage2D(target, level, ifmt, w, h, 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;
        }
 }
 
@@ -129,22 +132,22 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
                generate_mipmap();
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
-       image(img, srgb, false);
+       image(img, lv, srgb, false);
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb, bool from_buffer)
 {
        unsigned w = img.get_width();
        unsigned h = img.get_height();
        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, l);
        }
-       else if(w!=width || h!=height)
+       else if(w!=width || h!=height || (lv && lv!=levels))
                throw incompatible_data("Texture2D::image");
 
        PixelStore pstore = PixelStore::from_image(img);
@@ -277,7 +280,7 @@ bool Texture2D::AsyncLoader::process()
                        else
                                glGenTextures(1, &texture.id);
                }
-               texture.image(image, srgb_conversion, true);
+               texture.image(image, 0, srgb_conversion, true);
        }
 
        ++phase;