Remove the deprecated form of Texture3D::load_image

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

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index c8f59a094a0fed550a37a5721ae26329941a54ae..5c09f1ea4249919bf526703365c730c48b11d4e7 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
@@ -92,7 +91,10 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
        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;
@@ -121,52 +123,6 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
                generate_mipmap();
 }
 
-void Texture3D::load_image(const string &fn, int dp)
-{
-       Graphics::Image img;
-       img.load_file(fn);
-
-       unsigned w = img.get_width();
-       unsigned h = img.get_height();
-       unsigned d = 1;
-
-       if(dp==-1)
-       {
-               if(h%w)
-                       throw incompatible_data("Texture3D::load_image");
-               d = h/w;
-               h = w;
-       }
-       else if(dp==-2)
-       {
-               for(d=h; d*d>h; d>>=2) ;
-               for(; d*d<h; ++d) ;
-               if(d*d!=h)
-                       throw incompatible_data("Texture3D::load_image");
-               h = d;
-       }
-       else if(dp>0)
-       {
-               d = dp;
-               if(h%d)
-                       throw incompatible_data("Texture3D::load_image");
-               h /= d;
-       }
-       else
-               throw invalid_argument("Texture3D::load_image");
-
-       PixelFormat fmt = pixelformat_from_graphics(img.get_format());
-       if(width==0)
-               storage(storage_pixelformat_from_graphics(img.get_format()), w, h, d);
-       else if(w!=width || h!=height || d!=depth)
-               throw incompatible_data("Texture3D::load_image");
-
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
-
-       image(0, fmt, UNSIGNED_BYTE, img.get_data());
-}
-
 void Texture3D::image(const Graphics::Image &img, unsigned lv, bool srgb)
 {
        unsigned w = img.get_width();