Refactor get_level_size in various texture classes

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

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 1e9ec90344e242608caa55501268a08775a54aa2..78f8c9e983034f34eadec903c5c53ffb4ffd6c5d 100644 (file)
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -93,13 +93,13 @@ void Texture2D::image(unsigned level, const void *data)
 {
        if(width==0 || height==0)
                throw invalid_operation("Texture2D::image");
+       if(level>=levels)
+               throw out_of_range("Texture2D::image");
 
-       unsigned w = width;
-       unsigned h = height;
-       get_level_size(level, w, h);
+       LinAl::Vector<unsigned, 2> size = get_level_size(level);
 
        if(ARB_texture_storage)
-               return sub_image(level, 0, 0, w, h, data);
+               return sub_image(level, 0, 0, size.x, size.y, data);
 
        BindRestore _bind(this);
 
@@ -111,7 +111,7 @@ void Texture2D::image(unsigned level, const void *data)
 
        PixelComponents comp = get_components(storage_fmt);
        GLenum type = get_gl_type(get_component_type(storage_fmt));
-       glTexImage2D(target, level, storage_fmt, w, h, 0, comp, type, data);
+       glTexImage2D(target, level, storage_fmt, size.x, size.y, 0, comp, type, data);
 
        allocated |= 1<<level;
        if(auto_gen_mipmap && level==0)
@@ -132,6 +132,8 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 {
        if(width==0 || height==0)
                throw invalid_operation("Texture2D::sub_image");
+       if(level>=levels)
+               throw out_of_range("Texture2D::sub_image");
 
        Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
@@ -179,15 +181,17 @@ unsigned Texture2D::get_n_levels() const
        return n;
 }
 
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
+LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
 {
-       w >>= level;
-       h >>= level;
+       unsigned w = width>>level;
+       unsigned h = height>>level;
 
        if(!w && h)
                w = 1;
        else if(!h && w)
                h = 1;
+
+       return LinAl::Vector<unsigned, 2>(w, h);
 }
 
 Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)