Refactor get_level_size in various texture classes

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

diff --git a/source/core/texture2darray.cpp b/source/core/texture2darray.cpp
index 1ecb4cf2be69e1b34a28f1f8b8cea643b84e2325..1928d4e3503c6f68f2446125ffe4b423c96ac5fc 100644 (file)
--- a/source/core/texture2darray.cpp
+++ b/source/core/texture2darray.cpp
@@ -17,12 +17,11 @@ Texture2DArray::Texture2DArray():
 
 void Texture2DArray::layer_image(unsigned level, unsigned z, const void *data)
 {
-       unsigned w = get_width();
-       unsigned h = get_height();
-       unsigned d = get_depth();
-       get_level_size(level, w, h, d);
+       if(level>=levels || z>=depth)
+               throw out_of_range("Texture2DArray::layer_image");
 
-       sub_image(level, 0, 0, z, w, h, 1, data);
+       LinAl::Vector<unsigned, 3> size = get_level_size(level);
+       sub_image(level, 0, 0, z, size.x, size.y, 1, data);
 }
 
 void Texture2DArray::layer_image(unsigned level, unsigned z, PixelComponents comp, DataType type, const void *data)