X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=e38c99deb85e2dda60603b89e97405a013c763cd;hb=3efe3bab1c8290bd49a957ebec0ad97e58a35fcf;hp=41f4ab11280259f1fd68f621c8f82ee289f9dbed;hpb=4365124bd39bd6edbda6eaef64ec72a1a10565f8;p=libs%2Fgl.git diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp index 41f4ab11..e38c99de 100644 --- a/source/core/texture2d.cpp +++ b/source/core/texture2d.cpp @@ -1,3 +1,5 @@ +#include +#include #include "error.h" #include "texture2d.h" @@ -6,6 +8,27 @@ using namespace std; namespace Msp { namespace GL { +class Texture2D::AsyncLoader: public Resource::AsyncLoader +{ +private: + Texture2D &texture; + IO::Seekable &io; + Texture2D::AsyncTransfer transfer; + Graphics::Image image; + Graphics::ImageLoader *img_loader = 0; + DataFile::RawData *raw_data = 0; + unsigned n_bytes = 0; + int phase = 0; + +public: + AsyncLoader(Texture2D &, IO::Seekable &); + ~AsyncLoader(); + + virtual bool needs_sync() const; + virtual bool process(); +}; + + Texture2D::~Texture2D() { set_manager(0); @@ -15,7 +38,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 +48,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 +65,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 Texture2D::get_level_size(unsigned level) const @@ -76,12 +97,7 @@ LinAl::Vector Texture2D::get_level_size(unsigned level) const 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; + return new AsyncLoader(static_cast(*this), io); } @@ -99,18 +115,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 +129,146 @@ 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(); +} + + +Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i): + texture(t), + io(i) +{ + char magic[4] = { }; + io.read(magic, 4); + io.seek(0, IO::S_BEG); + + if(DataFile::RawData::detect_signature(string(magic, 4))) + { + raw_data = new DataFile::RawData; + raw_data->open_io(io, "async"); + } + else + img_loader = Graphics::ImageLoader::open_io(io); +} + +Texture2D::AsyncLoader::~AsyncLoader() +{ + delete img_loader; + delete raw_data; +} + +bool Texture2D::AsyncLoader::needs_sync() const +{ + return phase%2; +} + +bool Texture2D::AsyncLoader::process() +{ + if(phase==0) + { + if(raw_data) + n_bytes = raw_data->get_size(); + else + { + image.load_headers(*img_loader); + n_bytes = image.get_stride()*image.get_height(); + } + } + else if(phase==1) + { + if(img_loader) + { + unsigned w = image.get_width(); + unsigned h = image.get_height(); + texture.storage(pixelformat_from_image(image, texture.use_srgb_format), w, h); + } + + transfer = texture.sub_image_async(0, 0, 0, texture.width, texture.height); + } + else if(phase==2) + { + if(texture.swizzle==RGBA_TO_RGB) + { + const void *data; + if(raw_data) + { + raw_data->load(); + data = raw_data->get_data(); + } + else + { + image.load(*img_loader); + data = image.get_pixels(); + } + texture.stage_pixels(transfer.get_address(), data, texture.width*texture.height); + } + else if(raw_data) + raw_data->load_into(transfer.get_address()); + else + image.load_into(*img_loader, transfer.get_address()); + } + else if(phase==3) + { + transfer = Texture2D::AsyncTransfer(); + + if(texture.auto_gen_mipmap) + texture.generate_mipmap(); + } + + ++phase; + return phase>3; +} + } // namespace GL } // namespace Msp