Simplify applying texture swizzling

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

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index e25a11c09ce579b0fbed76a7ec6dc5a6ed5569fd..b50f8cf444c0c9fb1435ce97e756ffc1330b59c2 100644 (file)
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -19,7 +19,7 @@ Texture1D::Texture1D():
        static Require _req(MSP_texture1D);
 }
 
-void Texture1D::storage(PixelFormat fmt, unsigned wd)
+void Texture1D::storage(PixelFormat fmt, unsigned wd, unsigned lv)
 {
        if(width>0)
                throw invalid_operation("Texture1D::storage");
@@ -28,24 +28,29 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd)
 
        set_internal_format(fmt);
        width = wd;
+       levels = get_n_levels();
+       if(lv)
+               levels = min(levels, lv);
 }
 
 void Texture1D::allocate(unsigned level)
 {
+       if(width==0)
+               throw invalid_operation("Texture1D::allocate");
+       if(level>=levels)
+               throw invalid_argument("Texture1D::allocate");
        if(allocated&(1<<level))
                return;
 
        if(ARB_texture_storage)
        {
-               unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
+               Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
                if(ARB_direct_state_access)
-                       glTextureStorage1D(id, n_levels, ifmt, width);
+                       glTextureStorage1D(id, levels, ifmt, width);
                else
-               {
-                       BindRestore _bind(this);
-                       glTexStorage1D(target, n_levels, ifmt, width);
-               }
-               allocated |= (1<<n_levels)-1;
+                       glTexStorage1D(target, levels, ifmt, width);
+               apply_swizzle();
+               allocated |= (1<<levels)-1;
        }
        else
        {
@@ -65,13 +70,19 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
                return sub_image(level, 0, w, fmt, type, data);
 
        BindRestore _bind(this);
+
+       if(!allocated)
+       {
+               glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
+               apply_swizzle();
+       }
        glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
 
        allocated |= 1<<level;
-       if(gen_mipmap && level==0)
+       if(auto_gen_mipmap && level==0)
        {
-               auto_generate_mipmap();
-               allocated |= (1<<get_n_levels())-1;
+               generate_mipmap();
+               allocated |= (1<<levels)-1;
        }
 }
 
@@ -89,11 +100,11 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
        else
                glTexSubImage1D(target, level, x, wd, fmt, type, data);
 
-       if(gen_mipmap && level==0)
-               auto_generate_mipmap();
+       if(auto_gen_mipmap && level==0)
+               generate_mipmap();
 }
 
-void Texture1D::image(const Graphics::Image &img, bool srgb)
+void Texture1D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
        if(img.get_height()!=1)
                throw incompatible_data("Texture1D::image");
@@ -101,7 +112,7 @@ void Texture1D::image(const Graphics::Image &img, bool srgb)
        unsigned w = img.get_width();
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w);
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, lv);
        else if(w!=width)
                throw incompatible_data("Texture1D::image");
 
@@ -142,6 +153,7 @@ void Texture1D::Loader::init()
 {
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
+       add("storage", &Loader::storage_levels);
 }
 
 void Texture1D::Loader::raw_data(const string &data)
@@ -151,10 +163,13 @@ void Texture1D::Loader::raw_data(const string &data)
 
 void Texture1D::Loader::storage(PixelFormat fmt, unsigned w)
 {
-       if(srgb)
-               fmt = get_srgb_pixelformat(fmt);
        obj.storage(fmt, w);
 }
 
+void Texture1D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned l)
+{
+       obj.storage(fmt, w, l);
+}
+
 } // namespace GL
 } // namespace Msp