Add some utility functions for textures

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 2189fa83360ba5ed93264f84383f249a236b7e0b..95f9f790507292797573931f9c241b6ae877be6e 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -50,6 +50,9 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
                throw invalid_operation("Texture2D::storage");
        if(wd==0 || ht==0)
                throw invalid_argument("Texture2D::storage");
+
+       if(MSP_sized_internal_formats)
+               fmt = get_sized_pixelformat(fmt);
        require_pixelformat(fmt);
 
        ifmt = fmt;
@@ -82,8 +85,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
        if(gen_mipmap && level==0)
        {
                auto_generate_mipmap();
-               for(; (w || h); w>>=1, h>>=1, ++level) ;
-               allocated |= (1<<level)-1;
+               allocated |= (1<<get_n_levels())-1;
        }
 }
 
@@ -119,7 +121,14 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
        image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data());
 }
 
-void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
+unsigned Texture2D::get_n_levels() const
+{
+       unsigned n = 0;
+       for(unsigned s=max(width, height); s; s>>=1, ++n) ;
+       return n;
+}
+
+void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const
 {
        w >>= level;
        h >>= level;
@@ -168,7 +177,6 @@ void Texture2D::Loader::init()
 {
        add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
-       add("storage", &Loader::storage_b);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
@@ -183,11 +191,6 @@ void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
        obj.storage(fmt, w, h);
 }
 
-void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)
-{
-       storage(fmt, w, h);
-}
-
 
 Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i):
        texture(t),