Simplify applying texture swizzling

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 971d3f165393fd00ec631bd3620740111b3bfae5..d22070e680e9d67272a0a7e47d71ffd8aa1a7233 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -60,13 +60,12 @@ void Texture3D::allocate(unsigned level)
 
        if(ARB_texture_storage)
        {
+               Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
                if(ARB_direct_state_access)
                        glTextureStorage3D(id, levels, ifmt, width, height, depth);
                else
-               {
-                       BindRestore _bind(this);
                        glTexStorage3D(target, levels, ifmt, width, height, depth);
-               }
+               apply_swizzle();
                allocated |= (1<<levels)-1;
        }
        else
@@ -90,13 +89,19 @@ 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);
+
+       if(!allocated)
+       {
+               glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+               apply_swizzle();
+       }
        glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
        allocated |= 1<<level;
        if(auto_gen_mipmap && level==0)
        {
                generate_mipmap();
-               allocated |= (1<<get_n_levels())-1;
+               allocated |= (1<<levels)-1;
        }
 }
 
@@ -164,7 +169,7 @@ void Texture3D::load_image(const string &fn, int dp)
        image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-void Texture3D::image(const Graphics::Image &img, bool srgb)
+void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
        unsigned w = img.get_width();
        unsigned h = img.get_height();
@@ -187,10 +192,7 @@ void Texture3D::image(const Graphics::Image &img, bool srgb)
 
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)
-       {
-               unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, l);
-       }
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, d, lv);
        else if(w!=width || h!=height || d!=depth)
                throw incompatible_data("Texture3D::load_image");
 
@@ -247,6 +249,7 @@ void Texture3D::Loader::init()
 {
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
+       add("storage", &Loader::storage_levels);
 }
 
 void Texture3D::Loader::raw_data(const string &data)
@@ -259,5 +262,10 @@ void Texture3D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h, unsigne
        obj.storage(fmt, w, h, d);
 }
 
+void Texture3D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned d, unsigned l)
+{
+       obj.storage(fmt, w, h, d, l);
+}
+
 } // namespace GL
 } // namespace Msp