X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=7ce18d00a9fa075b5df6b2a5ea1dac741411165f;hp=f4af7e7259bef9ccaf3319be8c56df51cd9881a0;hb=eacacdda1dc40bb655a3df14b59260ce06329fb6;hpb=89dc716abe7fa671e1da1c033d955cd72da73f33 diff --git a/source/texture2d.cpp b/source/texture2d.cpp index f4af7e72..7ce18d00 100644 --- a/source/texture2d.cpp +++ b/source/texture2d.cpp @@ -1,7 +1,11 @@ -#include +#include +#include +#include #include "bindable.h" +#include "buffer.h" #include "error.h" #include "pixelstore.h" +#include "resources.h" #include "texture2d.h" using namespace std; @@ -9,22 +13,47 @@ using namespace std; namespace Msp { namespace GL { -Texture2D::Texture2D(): - Texture(GL_TEXTURE_2D), +class Texture2D::AsyncLoader: public Resource::AsyncLoader +{ +private: + Texture2D &texture; + IO::Seekable &io; + bool srgb_conversion; + Buffer pixel_buffer; + char *mapped_address; + Graphics::Image image; + unsigned n_bytes; + int phase; + +public: + AsyncLoader(Texture2D &, IO::Seekable &); + + void set_srgb_conversion(bool); + virtual bool needs_sync() const; + virtual bool process(); +}; + + +Texture2D::Texture2D(ResourceManager *m): + Texture(GL_TEXTURE_2D, m), width(0), height(0), allocated(0) { } +Texture2D::~Texture2D() +{ + set_manager(0); +} + void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht) { if(width>0) throw invalid_operation("Texture2D::storage"); if(wd==0 || ht==0) throw invalid_argument("Texture2D::storage"); - require_pixelformat(fmt); - ifmt = fmt; + set_internal_format(fmt); width = wd; height = ht; } @@ -34,7 +63,23 @@ void Texture2D::allocate(unsigned level) if(allocated&(1<>=1, h>>=1, ++level) ; - allocated |= (1< _bind(!ARB_direct_state_access, this); allocate(level); - BindRestore _bind(this); - glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data); + fmt = get_upload_format(fmt); + if(ARB_direct_state_access) + glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data); + else + glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data); + + if(gen_mipmap && level==0) + auto_generate_mipmap(); } -void Texture2D::load_image(const string &fn) +void Texture2D::image(const Graphics::Image &img, bool srgb) { - Graphics::Image img; - img.load_file(fn); - - image(img); + image(img, srgb, false); } -void Texture2D::image(const Graphics::Image &img) +void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer) { unsigned w = img.get_width(); unsigned h = img.get_height(); PixelFormat fmt = pixelformat_from_graphics(img.get_format()); if(width==0) - storage(storage_pixelformat_from_graphics(img.get_format()), w, h); + storage(storage_pixelformat_from_graphics(img.get_format(), srgb), w, h); else if(w!=width || h!=height) throw incompatible_data("Texture2D::image"); PixelStore pstore = PixelStore::from_image(img); BindRestore _bind_ps(pstore); - image(0, fmt, UNSIGNED_BYTE, img.get_data()); + 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; @@ -103,23 +162,44 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) h = 1; } +Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res) +{ + AsyncLoader *ldr = new AsyncLoader(*this, io); + if(res) + ldr->set_srgb_conversion(res->get_srgb_conversion()); + return ldr; +} + +UInt64 Texture2D::get_data_size() const +{ + return id ? width*height*get_pixel_size(ifmt) : 0; +} + +void Texture2D::unload() +{ + glDeleteTextures(1, &id); + id = 0; + // TODO check which params actually need refreshing + dirty_params = -1; +} + Texture2D::Loader::Loader(Texture2D &t): DataFile::DerivedObjectLoader(t) { - add("image_data", &Loader::image_data); - add("raw_data", &Loader::raw_data); - add("storage", &Loader::storage); - add("storage", &Loader::storage_b); + init(); } -void Texture2D::Loader::image_data(const string &data) +Texture2D::Loader::Loader(Texture2D &t, Collection &c): + DataFile::DerivedObjectLoader(t, c) { - Graphics::Image img; - IO::Memory mem(data.data(), data.size()); - img.load_io(mem); + init(); +} - obj.image(img); +void Texture2D::Loader::init() +{ + add("raw_data", &Loader::raw_data); + add("storage", &Loader::storage); } void Texture2D::Loader::raw_data(const string &data) @@ -129,12 +209,66 @@ 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); } -void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned) + +Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i): + texture(t), + io(i), + srgb_conversion(false), + pixel_buffer(PIXEL_UNPACK_BUFFER), + mapped_address(0), + phase(0) +{ } + +void Texture2D::AsyncLoader::set_srgb_conversion(bool c) +{ + srgb_conversion = c; +} + +bool Texture2D::AsyncLoader::needs_sync() const { - storage(fmt, w, h); + return phase%2; +} + +bool Texture2D::AsyncLoader::process() +{ + if(phase==0) + { + /* TODO Enhance the ImageLoader system so that the image can be loaded + directly to the buffer */ + image.load_io(io); + n_bytes = image.get_stride()*image.get_height(); + } + else if(phase==1) + { + pixel_buffer.data(n_bytes, 0); + mapped_address = reinterpret_cast(pixel_buffer.map(WRITE_ONLY)); + } + else if(phase==2) + { + const char *data = reinterpret_cast(image.get_data()); + copy(data, data+n_bytes, mapped_address); + } + else if(phase==3) + { + Bind _bind_buf(pixel_buffer, PIXEL_UNPACK_BUFFER); + if(!pixel_buffer.unmap()) + { + phase = 1; + return false; + } + + if(!texture.id) + glGenTextures(1, &texture.id); + texture.image(image, srgb_conversion, true); + } + + ++phase; + return phase>3; } } // namespace GL