X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=e38c99deb85e2dda60603b89e97405a013c763cd;hp=6edbba0d993a0f3795d264834c43054d5acd23b2;hb=HEAD;hpb=b09f265880a3a932441091b0f3822b06c112c595 diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp index 6edbba0d..e38c99de 100644 --- a/source/core/texture2d.cpp +++ b/source/core/texture2d.cpp @@ -1,10 +1,6 @@ -#include -#include -#include +#include #include -#include "buffer.h" #include "error.h" -#include "resources.h" #include "texture2d.h" using namespace std; @@ -17,12 +13,12 @@ class Texture2D::AsyncLoader: public Resource::AsyncLoader private: Texture2D &texture; IO::Seekable &io; - Buffer pixel_buffer; - char *mapped_address; + Texture2D::AsyncTransfer transfer; Graphics::Image image; - Graphics::ImageLoader *img_loader; - unsigned n_bytes; - int phase; + Graphics::ImageLoader *img_loader = 0; + DataFile::RawData *raw_data = 0; + unsigned n_bytes = 0; + int phase = 0; public: AsyncLoader(Texture2D &, IO::Seekable &); @@ -33,12 +29,6 @@ public: }; -Texture2D::Texture2D(ResourceManager *m): - Texture(GL_TEXTURE_2D, m), - width(0), - height(0) -{ } - Texture2D::~Texture2D() { set_manager(0); @@ -48,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; } @@ -58,35 +48,11 @@ 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); - GLenum gl_fmt = get_gl_pixelformat(storage_fmt); - if(ARB_texture_storage) - { - if(ARB_direct_state_access) - glTextureStorage2D(id, levels, gl_fmt, width, height); - else - { - bind_scratch(); - glTexStorage2D(target, levels, gl_fmt, width, height); - } - } - else - { - bind_scratch(); - glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1); - GLenum comp = get_gl_components(get_components(storage_fmt)); - GLenum type = get_gl_type(get_component_type(storage_fmt)); - for(unsigned i=0; i lv_size = get_level_size(i); - glTexImage2D(target, i, gl_fmt, lv_size.x, lv_size.y, 0, comp, type, 0); - } - } - - apply_swizzle(); + allocate(); } void Texture2D::image(unsigned level, const void *data) @@ -95,29 +61,19 @@ void Texture2D::image(unsigned level, const void *data) return sub_image(level, 0, 0, size.x, size.y, data); } -void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data) +void Texture2D::sub_image(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht, const void *data) { if(width==0 || height==0) throw invalid_operation("Texture2D::sub_image"); - if(level>=levels) + if(level>=n_levels || x>width || x+wd>width || y>height || y+ht>height) throw out_of_range("Texture2D::sub_image"); - GLenum comp = get_gl_components(get_components(storage_fmt)); - GLenum type = get_gl_type(get_component_type(storage_fmt)); - if(ARB_direct_state_access) - glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data); - else - { - bind_scratch(); - glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data); - } + Texture2DBackend::sub_image(level, x, y, wd, ht, data); } -void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const Buffer &buffer, unsigned offset) +Texture2D::AsyncTransfer Texture2D::sub_image_async(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht) { - glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer.id); - sub_image(level, x, y, wd, ht, reinterpret_cast(offset)); - glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + return AsyncTransfer(*this, level, x, y, wd, ht); } void Texture2D::image(const Graphics::Image &img, unsigned lv) @@ -126,13 +82,6 @@ void Texture2D::image(const Graphics::Image &img, unsigned lv) image(0, img.get_pixels()); } -unsigned Texture2D::get_n_levels() const -{ - unsigned n = 0; - for(unsigned s=max(width, height); s; s>>=1, ++n) ; - return n; -} - LinAl::Vector Texture2D::get_level_size(unsigned level) const { unsigned w = width>>level; @@ -148,19 +97,7 @@ LinAl::Vector Texture2D::get_level_size(unsigned level) const Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *) { - AsyncLoader *ldr = new AsyncLoader(*this, io); - return ldr; -} - -uint64_t Texture2D::get_data_size() const -{ - return id ? width*height*get_pixel_size(format) : 0; -} - -void Texture2D::unload() -{ - glDeleteTextures(1, &id); - id = 0; + return new AsyncLoader(static_cast(*this), io); } @@ -178,22 +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); - if(!obj.id) - obj.generate_id(); - } - obj.image(0, data.data()); -} - void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h) { obj.storage(fmt, w, h); @@ -205,19 +130,82 @@ void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, } +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), - mapped_address(0), - img_loader(Graphics::ImageLoader::open_io(io)), - phase(0) -{ } + 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() { - if(mapped_address) - pixel_buffer.unmap(); delete img_loader; + delete raw_data; } bool Texture2D::AsyncLoader::needs_sync() const @@ -229,32 +217,50 @@ bool Texture2D::AsyncLoader::process() { if(phase==0) { - image.load_headers(*img_loader); - n_bytes = image.get_stride()*image.get_height(); + 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) { - pixel_buffer.storage(n_bytes); - mapped_address = reinterpret_cast(pixel_buffer.map()); + 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) - image.load_into(*img_loader, mapped_address); - else if(phase==3) { - mapped_address = 0; - if(!pixel_buffer.unmap()) + if(texture.swizzle==RGBA_TO_RGB) { - phase = 1; - return false; + 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); } - - if(!texture.id) - texture.generate_id(); - - unsigned w = image.get_width(); - unsigned h = image.get_height(); - texture.storage(pixelformat_from_image(image, texture.use_srgb_format), w, h); - texture.sub_image(0, 0, 0, w, h, pixel_buffer, 0); + 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();