Use ARB_texture_storage for defining texture storage

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 8b014aee0c262fb811444c1c44a1fba0083df21e..d04a17e1fbb38bf81c507f9798406f75ca3b2942 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,4 +1,5 @@
 #include <cmath>
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
 #include <msp/graphics/image.h>
 #include "bindable.h"
@@ -11,6 +12,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+Texture3D::Texture3D(GLenum t):
+       Texture(t),
+       ifmt(RGB),
+       width(0),
+       height(0),
+       depth(0),
+       allocated(0)
+{ }
+
 Texture3D::Texture3D():
        Texture(GL_TEXTURE_3D),
        ifmt(RGB),
@@ -28,12 +38,15 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
                throw invalid_operation("Texture3D::storage");
        if(wd==0 || ht==0 || dp==0)
                throw invalid_argument("Texture3D::storage");
+
+       if(MSP_sized_internal_formats)
+               fmt = get_sized_pixelformat(fmt);
        require_pixelformat(fmt);
 
+       ifmt = fmt;
        width = wd;
        height = ht;
        depth = dp;
-       ifmt = fmt;
 }
 
 void Texture3D::allocate(unsigned level)
@@ -41,8 +54,18 @@ void Texture3D::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);
+               glTexStorage3D(target, n_levels, ifmt, width, height, depth);
+               allocated |= (1<<n_levels)-1;
+       }
+       else
+       {
+               PixelFormat base_fmt = get_base_pixelformat(ifmt);
+               image(level, base_fmt, get_alloc_type(base_fmt), 0);
+       }
 }
 
 void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
@@ -56,14 +79,16 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
        get_level_size(level, w, h, d);
 
        BindRestore _bind(this);
-       glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+       if(ARB_texture_storage)
+               sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
+       else
+               glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
        {
                auto_generate_mipmap();
-               for(; (w || h || d); w>>=1, h>>=1, d>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
@@ -157,11 +182,22 @@ void Texture3D::image(const Graphics::Image &img, bool srgb)
        image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
+unsigned Texture3D::get_n_levels() const
+{
+       unsigned s = max(width, height);
+       if(target!=GL_TEXTURE_2D_ARRAY)
+               s = max(s, depth);
+       unsigned n = 0;
+       for(; s; s>>=1, ++n) ;
+       return n;
+}
+
+void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) const
 {
        w >>= level;
        h >>= level;
-       d >>= level;
+       if(target!=GL_TEXTURE_2D_ARRAY)
+               d >>= level;
 
        if(!w && (h || d))
                w = 1;