Prefer explicit mipmap generation with glGenerateMipmap

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

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index 44e49f51142fde02d41fa4da16b5119cb129d840..e5a496a455095093c89502d15c3727dd7306ecec 100644 (file)
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -61,9 +61,9 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 
        BindRestore _bind(this);
        if(ARB_texture_storage)
-               sub_image(level, 0, w, fmt, type, data);
-       else
-               glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+               return sub_image(level, 0, w, fmt, type, data);
+
+       glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
@@ -82,6 +82,9 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
 
        BindRestore _bind(this);
        glTexSubImage1D(target, level, x, wd, fmt, type, data);
+
+       if(gen_mipmap && level==0)
+               auto_generate_mipmap();
 }
 
 void Texture1D::image(const Graphics::Image &img, bool srgb)