Use DSA for binding textures if available

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index f64f548ad926ef5901f43a775f8da3e3b6427e25..4cba3afccbfade39750ef6ec00cd890182142b58 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -3,6 +3,7 @@
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
+#include <msp/gl/extensions/ext_texture_array.h>
 #include <msp/graphics/image.h>
 #include "bindable.h"
 #include "error.h"
@@ -16,7 +17,6 @@ namespace GL {
 
 Texture3D::Texture3D(GLenum t):
        Texture(t),
-       ifmt(RGB),
        width(0),
        height(0),
        depth(0),
@@ -25,7 +25,6 @@ Texture3D::Texture3D(GLenum t):
 
 Texture3D::Texture3D():
        Texture(GL_TEXTURE_3D),
-       ifmt(RGB),
        width(0),
        height(0),
        depth(0),
@@ -41,11 +40,7 @@ void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
        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;
+       set_internal_format(fmt);
        width = wd;
        height = ht;
        depth = dp;
@@ -89,7 +84,7 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
                return sub_image(level, 0, 0, 0, w, h, d, fmt, type, data);
 
        BindRestore _bind(this);
-       glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
+       glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
@@ -107,6 +102,7 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
        Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
+       fmt = get_upload_format(fmt);
        if(ARB_direct_state_access)
                glTextureSubImage3D(id, level, x, y, z, wd, ht, dp, fmt, type, data);
        else