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 23cb9477e122c69ddabdbf614dfafca05ed71801..8ecebdfb6e1748132bf39a14040f5bae8704aa33 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,3 +1,5 @@
+#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"
@@ -68,9 +70,14 @@ void Texture2D::allocate(unsigned level)
 
        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);
+               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
@@ -108,10 +115,13 @@ 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");
 
-       BindRestore _bind(this);
+       Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
-       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();