Remove remaining deprecated things from the core classes

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

diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index a7dae70350dab74416eb399b22dbcac63481e21d..984ffac7d4ef1a07985b3bf033915bbac3cf5b57 100644 (file)
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -1,5 +1,4 @@
 #include <cmath>
-#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_direct_state_access.h>
 #include <msp/gl/extensions/arb_texture_storage.h>
 #include <msp/gl/extensions/ext_texture3d.h>
@@ -105,13 +104,6 @@ void Texture3D::image(unsigned level, const void *data)
        allocated |= 1<<level;
 }
 
-void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
-{
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("Texture3D::image");
-       image(level, data);
-}
-
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data)
 {
        if(width==0 || height==0 || depth==0)
@@ -132,13 +124,6 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
        }
 }
 
-void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)
-{
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("Texture3D::sub_image");
-       sub_image(level, x, y, z, wd, ht, dp, data);
-}
-
 void Texture3D::image(const Graphics::Image &img, unsigned lv)
 {
        unsigned w = img.get_width();
@@ -183,7 +168,7 @@ LinAl::Vector<unsigned, 3> Texture3D::get_level_size(unsigned level) const
        return LinAl::Vector<unsigned, 3>(w, h, d);
 }
 
-UInt64 Texture3D::get_data_size() const
+uint64_t Texture3D::get_data_size() const
 {
        return id ? width*height*depth*get_pixel_size(storage_fmt) : 0;
 }