Store default-block uniform data in a memory block

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

diff --git a/source/core/texture2darray.cpp b/source/core/texture2darray.cpp
index 1928d4e3503c6f68f2446125ffe4b423c96ac5fc..3c54f7c0937bc580dd964846b8aab2cdad05b8df 100644 (file)
--- a/source/core/texture2darray.cpp
+++ b/source/core/texture2darray.cpp
@@ -1,7 +1,6 @@
 #include <msp/datafile/collection.h>
 #include <msp/gl/extensions/ext_texture_array.h>
 #include "error.h"
-#include "pixelstore.h"
 #include "texture2darray.h"
 
 using namespace std;
@@ -24,13 +23,6 @@ void Texture2DArray::layer_image(unsigned level, unsigned z, const void *data)
        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())
@@ -44,9 +36,6 @@ void Texture2DArray::layer_image(unsigned level, unsigned z, const Graphics::Ima
        if(get_components(fmt)!=get_components(format) || get_component_type(fmt)!=get_component_type(format))
                throw incompatible_data("Texture2DArray::layer_image");
 
-       PixelStore pstore = PixelStore::from_image(img);
-       BindRestore _bind_ps(pstore);
-
        layer_image(level, z, img.get_pixels());
 }