Refactor get_level_size in various texture classes

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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index a268857d4996cd9bc08d98d9d5c8918bc7d25a3c..f6268d697d6d60c00735c6230e6ff6c701eb8b7c 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -80,14 +80,13 @@ void Texture3D::image(unsigned level, const void *data)
 {
        if(width==0 || height==0 || depth==0)
                throw invalid_operation("Texture3D::image");
+       if(level>=levels)
+               throw out_of_range("Texture3D::image");
 
-       unsigned w = width;
-       unsigned h = height;
-       unsigned d = depth;
-       get_level_size(level, w, h, d);
+       LinAl::Vector<unsigned, 3> size = get_level_size(level);
 
        if(ARB_texture_storage)
-               return sub_image(level, 0, 0, 0, w, h, d, data);
+               return sub_image(level, 0, 0, 0, size.x, size.y, size.z, data);
 
        BindRestore _bind(this);
 
@@ -99,7 +98,7 @@ void Texture3D::image(unsigned level, const void *data)
 
        PixelComponents comp = get_components(storage_fmt);
        GLenum type = get_gl_type(get_component_type(storage_fmt));
-       glTexImage3D(target, level, storage_fmt, width, height, depth, 0, comp, type, data);
+       glTexImage3D(target, level, storage_fmt, size.x, size.y, size.z, 0, comp, type, data);
 
        allocated |= 1<<level;
        if(auto_gen_mipmap && level==0)
@@ -119,7 +118,9 @@ void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
 {
        if(width==0 || height==0 || depth==0)
-               throw invalid_operation("Texture3D::image");
+               throw invalid_operation("Texture3D::sub_image");
+       if(level>=levels)
+               throw out_of_range("Texture3D::sub_image");
 
        Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
@@ -171,10 +172,11 @@ unsigned Texture3D::get_n_levels() const
        return n;
 }
 
-void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d) const
+LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
 {
-       w >>= level;
-       h >>= level;
+       unsigned w = width>>level;
+       unsigned h = height>>level;
+       unsigned d = depth;
        if(target!=GL_TEXTURE_2D_ARRAY)
                d >>= level;
 
@@ -184,6 +186,8 @@ void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigne
                h = 1;
        if(!d && (w || h))
                d = 1;
+
+       return LinAl::Vector<unsigned, 3>(w, h, d);
 }
 
 UInt64 Texture3D::get_data_size() const