Use ARB_texture_storage for defining texture storage

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

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index 78c9ed0c54209a067c51516126b797289ddb82d4..44e49f51142fde02d41fa4da16b5119cb129d840 100644 (file)
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -1,3 +1,4 @@
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/msp_texture1d.h>
 #include "bindable.h"
 #include "error.h"
@@ -37,8 +38,18 @@ void Texture1D::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);
+               glTexStorage1D(target, n_levels, ifmt, width);
+               allocated |= (1<<n_levels)-1;
+       }
+       else
+       {
+               PixelFormat base_fmt = get_base_pixelformat(ifmt);
+               image(level, base_fmt, get_alloc_type(base_fmt), 0);
+       }
 }
 
 void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -49,14 +60,16 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
        unsigned w = get_level_size(level);
 
        BindRestore _bind(this);
-       glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+       if(ARB_texture_storage)
+               sub_image(level, 0, w, fmt, type, data);
+       else
+               glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
        {
                auto_generate_mipmap();
-               for(; w; w>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
@@ -86,7 +99,14 @@ void Texture1D::image(const Graphics::Image &img, bool srgb)
        image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-unsigned Texture1D::get_level_size(unsigned level)
+unsigned Texture1D::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=width; s; s>>=1, ++n) ;
+       return n;
+}
+
+unsigned Texture1D::get_level_size(unsigned level) const
 {
        return width>>level;
 }