Simplify applying texture swizzling

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 47e0c7434d0ef56c7fbf892b0ee45a31f4552710..559167f8ba4d5eefc017e6e158d76dec55127cf6 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -72,13 +72,12 @@ void Texture2D::allocate(unsigned level)
 
        if(ARB_texture_storage)
        {
+               Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
                if(ARB_direct_state_access)
                        glTextureStorage2D(id, levels, ifmt, width, height);
                else
-               {
-                       BindRestore _bind(this);
                        glTexStorage2D(target, levels, ifmt, width, height);
-               }
+               apply_swizzle();
                allocated |= (1<<levels)-1;
        }
        else
@@ -101,13 +100,19 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
                return sub_image(level, 0, 0, w, h, fmt, type, data);
 
        BindRestore _bind(this);
+
+       if(!allocated)
+       {
+               glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+               apply_swizzle();
+       }
        glTexImage2D(target, level, ifmt, w, h, 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;
        }
 }
 
@@ -129,22 +134,19 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
                generate_mipmap();
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
-       image(img, srgb, false);
+       image(img, lv, srgb, false);
 }
 
-void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
+void Texture2D::image(const Graphics::Image &img, unsigned lv, bool srgb, bool from_buffer)
 {
        unsigned w = img.get_width();
        unsigned h = img.get_height();
        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, l);
-       }
-       else if(w!=width || h!=height)
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, lv);
+       else if(w!=width || h!=height || (lv && lv!=levels))
                throw incompatible_data("Texture2D::image");
 
        PixelStore pstore = PixelStore::from_image(img);
@@ -189,8 +191,7 @@ void Texture2D::unload()
        glDeleteTextures(1, &id);
        id = 0;
        allocated = 0;
-       // TODO check which params actually need refreshing
-       dirty_params = -1;
+       default_sampler.unload();
 }
 
 
@@ -210,6 +211,7 @@ void Texture2D::Loader::init()
 {
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
+       add("storage", &Loader::storage_levels);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
@@ -222,6 +224,11 @@ void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
        obj.storage(fmt, w, h);
 }
 
+void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned l)
+{
+       obj.storage(fmt, w, h, l);
+}
+
 
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
        texture(t),
@@ -277,7 +284,7 @@ bool Texture2D::AsyncLoader::process()
                        else
                                glGenTextures(1, &texture.id);
                }
-               texture.image(image, srgb_conversion, true);
+               texture.image(image, 0, srgb_conversion, true);
        }
 
        ++phase;