Prefer explicit mipmap generation with glGenerateMipmap

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 95f9f790507292797573931f9c241b6ae877be6e..4d6e32f5550cd6f48ee68c71d957278b7ffe355e 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
@@ -65,8 +66,18 @@ void Texture2D::allocate(unsigned level)
        if(allocated&(1<<level))
                return;
 
-       PixelFormat base_fmt = get_base_pixelformat(ifmt);
-       image(level, base_fmt, get_alloc_type(base_fmt), 0);
+       if(ARB_texture_storage)
+       {
+               BindRestore _bind(this);
+               unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+               glTexStorage2D(target, n_levels, ifmt, width, height);
+               allocated |= (1<<n_levels)-1;
+       }
+       else
+       {
+               PixelFormat base_fmt = get_base_pixelformat(ifmt);
+               image(level, base_fmt, get_alloc_type(base_fmt), 0);
+       }
 }
 
 void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -79,6 +90,9 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
        get_level_size(level, w, h);
 
        BindRestore _bind(this);
+       if(ARB_texture_storage)
+               return sub_image(level, 0, 0, w, h, fmt, type, data);
+
        glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
        allocated |= 1<<level;
@@ -98,6 +112,9 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 
        BindRestore _bind(this);
        glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+
+       if(gen_mipmap && level==0)
+               auto_generate_mipmap();
 }
 
 void Texture2D::image(const Graphics::Image &img, bool srgb)