Use ARB_direct_state_access to avoid some bind calls

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 4d3dac037291137856d28a77926e9517ac9475de..8ecebdfb6e1748132bf39a14040f5bae8704aa33 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,3 +1,6 @@
+#include <msp/core/raii.h>
+#include <msp/gl/extensions/arb_direct_state_access.h>
+#include <msp/gl/extensions/arb_texture_storage.h>
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
@@ -65,8 +68,23 @@ 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)
+       {
+               unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+               if(ARB_direct_state_access)
+                       glTextureStorage2D(id, n_levels, ifmt, width, height);
+               else
+               {
+                       BindRestore _bind(this);
+                       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)
@@ -78,6 +96,9 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
        unsigned h = height;
        get_level_size(level, w, h);
 
+       if(ARB_texture_storage)
+               return sub_image(level, 0, 0, w, h, fmt, type, data);
+
        BindRestore _bind(this);
        glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
 
@@ -85,8 +106,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
        if(gen_mipmap && level==0)
        {
                auto_generate_mipmap();
-               for(; (w || h); w>>=1, h>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
@@ -95,10 +115,16 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        if(width==0 || height==0)
                throw invalid_operation("Texture2D::sub_image");
 
+       Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
-       BindRestore _bind(this);
-       glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
+       if(ARB_direct_state_access)
+               glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
+       else
+               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)
@@ -122,7 +148,14 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
        image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
 }
 
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
+unsigned Texture2D::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=max(width, height); s; s>>=1, ++n) ;
+       return n;
+}
+
+void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
 {
        w >>= level;
        h >>= level;