Add an asynchronous version of Texture2D::sub_image

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

diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index 41f4ab11280259f1fd68f621c8f82ee289f9dbed..74071535e73f41e768f053cd5041479fe80353c3 100644 (file)
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -15,7 +15,7 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
 {
        if(width>0)
        {
-               if(fmt!=format || wd!=width || ht!=height || (lv && lv!=levels))
+               if(fmt!=format || wd!=width || ht!=height || (lv && lv!=n_levels))
                        throw incompatible_data("Texture2D::storage");
                return;
        }
@@ -25,9 +25,9 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv)
        set_format(fmt);
        width = wd;
        height = ht;
-       levels = get_n_levels();
+       n_levels = count_levels(max(width, height));
        if(lv>0)
-               levels = min(levels, lv);
+               n_levels = min(n_levels, lv);
 
        allocate();
 }
@@ -42,23 +42,21 @@ void Texture2D::sub_image(unsigned level, unsigned x, unsigned y, unsigned wd, u
 {
        if(width==0 || height==0)
                throw invalid_operation("Texture2D::sub_image");
-       if(level>=levels || x>width || x+wd>width || y>height || y+ht>height)
+       if(level>=n_levels || x>width || x+wd>width || y>height || y+ht>height)
                throw out_of_range("Texture2D::sub_image");
 
        Texture2DBackend::sub_image(level, x, y, wd, ht, data);
 }
 
-void Texture2D::image(const Graphics::Image &img, unsigned lv)
+Texture2D::AsyncTransfer Texture2D::sub_image_async(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht)
 {
-       storage(pixelformat_from_image(img, use_srgb_format), img.get_width(), img.get_height(), lv);
-       image(0, img.get_pixels());
+       return AsyncTransfer(*this, level, x, y, wd, ht);
 }
 
-unsigned Texture2D::get_n_levels() const
+void Texture2D::image(const Graphics::Image &img, unsigned lv)
 {
-       unsigned n = 0;
-       for(unsigned s=max(width, height); s; s>>=1, ++n) ;
-       return n;
+       storage(pixelformat_from_image(img, use_srgb_format), img.get_width(), img.get_height(), lv);
+       image(0, img.get_pixels());
 }
 
 LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
@@ -74,16 +72,6 @@ LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
        return LinAl::Vector<unsigned, 2>(w, h);
 }
 
-Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
-{
-       return create_async_loader(io);
-}
-
-uint64_t Texture2D::get_data_size() const
-{
-       return id ? width*height*get_pixel_size(format) : 0;
-}
-
 
 Texture2D::Loader::Loader(Texture2D &t):
        DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
@@ -99,18 +87,10 @@ Texture2D::Loader::Loader(Texture2D &t, Collection &c):
 
 void Texture2D::Loader::init()
 {
-       add("raw_data", &Loader::raw_data);
        add("storage", &Loader::storage);
        add("storage", &Loader::storage_levels);
 }
 
-void Texture2D::Loader::raw_data(const string &data)
-{
-       if(obj.manager)
-               obj.set_manager(0);
-       obj.image(0, data.data());
-}
-
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
        obj.storage(fmt, w, h);
@@ -121,5 +101,60 @@ void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h,
        obj.storage(fmt, w, h, l);
 }
 
+
+Texture2D::AsyncTransfer::AsyncTransfer(Texture2D &t, unsigned l, unsigned x_, unsigned y_, unsigned wd, unsigned ht):
+       texture(&t),
+       level(l),
+       x(x_),
+       y(y_),
+       width(wd),
+       height(ht),
+       data_size(width*height*get_pixel_size(texture->storage_fmt)),
+       dest_addr(0)
+{
+       dest_addr = allocate();
+}
+
+Texture2D::AsyncTransfer::AsyncTransfer(AsyncTransfer &&other):
+       Texture2DBackend::AsyncTransfer(move(other)),
+       texture(other.texture),
+       level(other.level),
+       x(other.x),
+       y(other.y),
+       width(other.width),
+       height(other.height),
+       data_size(other.data_size),
+       dest_addr(other.dest_addr)
+{
+       other.dest_addr = 0;
+}
+
+Texture2D::AsyncTransfer &Texture2D::AsyncTransfer::operator=(AsyncTransfer &&other)
+{
+       if(dest_addr)
+               finalize();
+
+       Texture2DBackend::AsyncTransfer::operator=(move(other));
+
+       texture = other.texture;
+       level = other.level;
+       x = other.x;
+       y = other.y;
+       width = other.width;
+       height = other.height;
+       data_size = other.data_size;
+       dest_addr = other.dest_addr;
+
+       other.dest_addr = 0;
+
+       return *this;
+}
+
+Texture2D::AsyncTransfer::~AsyncTransfer()
+{
+       if(dest_addr)
+               finalize();
+}
+
 } // namespace GL
 } // namespace Msp