Move the whole-texture image call and raw data loading to base class

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

diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index ff2b28755bb3e8e37c3dbadf57f6695b24e13d83..0e0a1fc9178dca4ebd8b4cfc55bd52185b5e5b51 100644 (file)
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -49,6 +49,14 @@ void TextureCube::storage(PixelFormat fmt, unsigned sz, unsigned lv)
        allocate();
 }
 
+void TextureCube::image(unsigned level, const void *data)
+{
+       const char *pixels = static_cast<const char *>(data);
+       unsigned face_size = size*size*get_pixel_size(storage_fmt);
+       for(unsigned i=0; i<6; ++i)
+               image(static_cast<TextureCubeFace>(i), level, pixels+i*face_size);
+}
+
 void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 {
        unsigned lsz = get_level_size(level);
@@ -90,10 +98,7 @@ void TextureCube::image(const Graphics::Image &img, unsigned lv)
        else if(w!=size || h!=size)
                throw incompatible_data("TextureCube::image");
 
-       const char *pixels = reinterpret_cast<const char *>(img.get_pixels());
-       unsigned face_size = img.get_stride()*size;
-       for(unsigned i=0; i<6; ++i)
-               image(static_cast<TextureCubeFace>(i), 0, pixels+i*face_size);
+       image(0, img.get_pixels());
 }
 
 unsigned TextureCube::get_n_levels() const