Use DSA for binding textures if available

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

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index ed7d8f6e2b877fd4f660d71dbdc72874ef3de34b..e25a11c09ce579b0fbed76a7ec6dc5a6ed5569fd 100644 (file)
--- a/source/texture1d.cpp
+++ b/source/texture1d.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 <msp/gl/extensions/msp_texture1d.h>
 #include "bindable.h"
@@ -11,7 +13,6 @@ namespace GL {
 
 Texture1D::Texture1D():
        Texture(GL_TEXTURE_1D),
-       ifmt(RGB),
        width(0),
        allocated(0)
 {
@@ -25,11 +26,7 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd)
        if(wd==0)
                throw invalid_argument("Texture1D::storage");
 
-       if(MSP_sized_internal_formats)
-               fmt = get_sized_pixelformat(fmt);
-       require_pixelformat(fmt);
-
-       ifmt = fmt;
+       set_internal_format(fmt);
        width = wd;
 }
 
@@ -40,9 +37,14 @@ void Texture1D::allocate(unsigned level)
 
        if(ARB_texture_storage)
        {
-               BindRestore _bind(this);
                unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
-               glTexStorage1D(target, n_levels, ifmt, width);
+               if(ARB_direct_state_access)
+                       glTextureStorage1D(id, n_levels, ifmt, width);
+               else
+               {
+                       BindRestore _bind(this);
+                       glTexStorage1D(target, n_levels, ifmt, width);
+               }
                allocated |= (1<<n_levels)-1;
        }
        else
@@ -63,7 +65,7 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
                return sub_image(level, 0, w, fmt, type, data);
 
        BindRestore _bind(this);
-       glTexImage1D(target, level, ifmt, w, 0, fmt, type, data);
+       glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
@@ -78,10 +80,14 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
        if(width==0)
                throw invalid_operation("Texture3D::image");
 
-       BindRestore _bind(this);
+       Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
-       glTexSubImage1D(target, level, x, wd, fmt, type, data);
+       fmt = get_upload_format(fmt);
+       if(ARB_direct_state_access)
+               glTextureSubImage1D(id, level, x, wd, fmt, type, data);
+       else
+               glTexSubImage1D(target, level, x, wd, fmt, type, data);
 
        if(gen_mipmap && level==0)
                auto_generate_mipmap();