Remove remaining deprecated things from the core classes

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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index 6eaa3a4470445d3221afeba689a86f508fb76bc0..4bbf7e6f5d07da4e1f322775124e1b3eefe9de79 100644 (file)
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -139,13 +139,6 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
        }
 }
 
-void TextureCube::image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data)
-{
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("TextureCube::image");
-       image(face, level, data);
-}
-
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
 {
        if(size==0)
@@ -166,13 +159,6 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
        }
 }
 
-void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
-{
-       if(comp!=get_components(format) || type!=get_component_type(format))
-               throw incompatible_data("TextureCube::subimage");
-       sub_image(face, level, x, y, wd, ht, data);
-}
-
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
 {
        unsigned w = img.get_width();
@@ -186,11 +172,6 @@ void TextureCube::image(TextureCubeFace face, const Graphics::Image &img)
        image(face, 0, img.get_pixels());
 }
 
-void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool)
-{
-       image(face, img);
-}
-
 void TextureCube::image(const Graphics::Image &img, unsigned lv)
 {
        unsigned w = img.get_width();
@@ -270,7 +251,7 @@ Vector3 TextureCube::get_texel_direction(TextureCubeFace face, unsigned u, unsig
        return fv+s*sv+t*tv;
 }
 
-UInt64 TextureCube::get_data_size() const
+uint64_t TextureCube::get_data_size() const
 {
        return id ? size*size*6*get_pixel_size(storage_fmt) : 0;
 }