Refactor get_level_size in various texture classes

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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 93faa3703ab993ee29e05710347c56be82c3bca2..543bb9d40ec00e954ce894d9699e86c364405dd8 100644 (file)
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -103,10 +103,10 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 {
        if(size==0)
                throw invalid_operation("TextureCube::image");
+       if(level>=levels)
+               throw out_of_range("TextureCube::image");
 
        unsigned s = get_level_size(level);
-       if(s==0)
-               throw out_of_range("TextureCube::image");
 
        if(ARB_texture_storage)
                return sub_image(face, level, 0, 0, s, s, data);
@@ -157,6 +157,8 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 {
        if(size==0)
                throw invalid_operation("TextureCube::sub_image");
+       if(level>=levels)
+               throw out_of_range("TextureCube::sub_image");
 
        Conditional<BindRestore> _bind(!ARB_direct_state_acess, this);
        allocate(level);