Merge branch 'animation-rework'

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

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 75b84ec7bbe5747c17ee47b137ba56df33e9101e..806e4a179bded9f8a71264ecce78bccafc529870 100644 (file)
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -46,7 +46,7 @@ Texture2D::~Texture2D()
        set_manager(0);
 }
 
-void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
+void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
        if(width>0)
                throw invalid_operation("Texture2D::storage");
@@ -56,24 +56,30 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
        set_internal_format(fmt);
        width = wd;
        height = ht;
+       levels = get_n_levels();
+       if(lv>0)
+               levels = min(levels, lv);
 }
 
 void Texture2D::allocate(unsigned level)
 {
+       if(width==0 || height==0)
+               throw invalid_operation("Texture2D::allocate");
+       if(level>=levels)
+               throw invalid_argument("Texture2D::allocate");
        if(allocated&(1<<level))
                return;
 
        if(ARB_texture_storage)
        {
-               unsigned n_levels = (is_mipmapped(min_filter) ? get_n_levels() : 1);
                if(ARB_direct_state_access)
-                       glTextureStorage2D(id, n_levels, ifmt, width, height);
+                       glTextureStorage2D(id, levels, ifmt, width, height);
                else
                {
                        BindRestore _bind(this);
-                       glTexStorage2D(target, n_levels, ifmt, width, height);
+                       glTexStorage2D(target, levels, ifmt, width, height);
                }
-               allocated |= (1<<n_levels)-1;
+               allocated |= (1<<levels)-1;
        }
        else
        {
@@ -95,7 +101,7 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
                return sub_image(level, 0, 0, w, h, fmt, type, data);
 
        BindRestore _bind(this);
-       glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
+       glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
        allocated |= 1<<level;
        if(gen_mipmap && level==0)
@@ -113,6 +119,7 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
        Conditional<BindRestore> _bind(!ARB_direct_state_access, this);
        allocate(level);
 
+       fmt = get_upload_format(fmt);
        if(ARB_direct_state_access)
                glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data);
        else
@@ -133,7 +140,10 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer)
        unsigned h = img.get_height();
        PixelFormat fmt = pixelformat_from_graphics(img.get_format());
        if(width==0)
-               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h);
+       {
+               unsigned l = (is_mipmapped(min_filter) ? mipmap_levels ? mipmap_levels : 0 : 1);
+               storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h, l);
+       }
        else if(w!=width || h!=height)
                throw incompatible_data("Texture2D::image");
 
@@ -171,7 +181,7 @@ Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res)
 
 UInt64 Texture2D::get_data_size() const
 {
-       return id ? width*height*get_component_count(ifmt) : 0;
+       return id ? width*height*get_pixel_size(ifmt) : 0;
 }
 
 void Texture2D::unload()
@@ -208,8 +218,6 @@ void Texture2D::Loader::raw_data(const string &data)
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
-       if(srgb)
-               fmt = get_srgb_pixelformat(fmt);
        obj.storage(fmt, w, h);
 }