Check the flat qualifier from the correct member

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

diff --git a/source/core/texture2darray.cpp b/source/core/texture2darray.cpp
index 19066c726bdb16fda9bb6af27cd0904324901199..07f04c691b7dad0f9387ecd5362ece69196a6264 100644 (file)
--- a/source/core/texture2darray.cpp
+++ b/source/core/texture2darray.cpp
@@ -1,5 +1,3 @@
-#include <msp/datafile/collection.h>
-#include <msp/gl/extensions/ext_texture_array.h>
 #include "error.h"
 #include "texture2darray.h"
 
@@ -8,28 +6,15 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Texture2DArray::Texture2DArray():
-       Texture3D(GL_TEXTURE_2D_ARRAY)
-{
-       static Require _req(EXT_texture_array);
-}
-
 void Texture2DArray::layer_image(unsigned level, unsigned z, const void *data)
 {
-       if(level>=levels || z>=depth)
+       if(level>=n_levels || z>=depth)
                throw out_of_range("Texture2DArray::layer_image");
 
        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)
-{
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("Texture2DArray::layer_image");
-       layer_image(level, z, data);
-}
-
 void Texture2DArray::layer_image(unsigned level, unsigned z, const Graphics::Image &img)
 {
        if(!get_width())