Add some utility functions for textures

[libs/gl.git] / source / texture1d.cpp

diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index a0ab79b943aef573e192edcc36e1e011fffb77c7..0dc85586cbc2e76c328077ca9b666b96c16873e9 100644 (file)
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -23,6 +23,9 @@ void Texture1D::storage(PixelFormat fmt, unsigned wd)
                throw invalid_operation("Texture1D::storage");
        if(wd==0)
                throw invalid_argument("Texture1D::storage");
+
+       if(MSP_sized_internal_formats)
+               fmt = get_sized_pixelformat(fmt);
        require_pixelformat(fmt);
 
        ifmt = fmt;
@@ -52,8 +55,7 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
        if(gen_mipmap && level==0)
        {
                auto_generate_mipmap();
-               for(; w; w>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
@@ -83,7 +85,14 @@ void Texture1D::image(const Graphics::Image &img, bool srgb)
        image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
-unsigned Texture1D::get_level_size(unsigned level)
+unsigned Texture1D::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=width; s; s>>=1, ++n) ;
+       return n;
+}
+
+unsigned Texture1D::get_level_size(unsigned level) const
 {
        return width>>level;
 }