X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=0e76128c7bc5666da5828f11fe98f5398ecaf380;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=806e4a179bded9f8a71264ecce78bccafc529870;hpb=8ed377139d48a6fc39eeed9f3494bbe41aed4107;p=libs%2Fgl.git diff --git a/source/texture2d.cpp b/source/texture2d.cpp index 806e4a17..0e76128c 100644 --- a/source/texture2d.cpp +++ b/source/texture2d.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "bindable.h" #include "buffer.h" #include "error.h" @@ -18,17 +19,17 @@ class Texture2D::AsyncLoader: public Resource::AsyncLoader private: Texture2D &texture; IO::Seekable &io; - bool srgb_conversion; Buffer pixel_buffer; char *mapped_address; Graphics::Image image; + Graphics::ImageLoader *img_loader; unsigned n_bytes; int phase; public: AsyncLoader(Texture2D &, IO::Seekable &); + ~AsyncLoader(); - void set_srgb_conversion(bool); virtual bool needs_sync() const; virtual bool process(); }; @@ -53,7 +54,7 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv) if(wd==0 || ht==0) throw invalid_argument("Texture2D::storage"); - set_internal_format(fmt); + set_format(fmt); width = wd; height = ht; levels = get_n_levels(); @@ -72,23 +73,19 @@ void Texture2D::allocate(unsigned level) if(ARB_texture_storage) { + Conditional _bind(!ARB_direct_state_access, this); if(ARB_direct_state_access) - glTextureStorage2D(id, levels, ifmt, width, height); + glTextureStorage2D(id, levels, storage_fmt, width, height); else - { - BindRestore _bind(this); - glTexStorage2D(target, levels, ifmt, width, height); - } + glTexStorage2D(target, levels, storage_fmt, width, height); + apply_swizzle(); allocated |= (1< _bind(!ARB_direct_state_access, this); allocate(level); - fmt = get_upload_format(fmt); + PixelComponents comp = get_components(storage_fmt); + DataType type = get_component_type(storage_fmt); if(ARB_direct_state_access) - glTextureSubImage2D(id, level, x, y, wd, ht, fmt, type, data); + glTextureSubImage2D(id, level, x, y, wd, ht, comp, type, data); else - glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data); + glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data); - if(gen_mipmap && level==0) - auto_generate_mipmap(); + if(auto_gen_mipmap && level==0) + generate_mipmap(); } -void Texture2D::image(const Graphics::Image &img, bool srgb) +void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data) { - image(img, srgb, false); + if(comp!=get_components(format) || type!=get_component_type(format)) + throw incompatible_data("Texture2D::sub_image"); + sub_image(level, x, y, wd, ht, data); } -void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer) +void Texture2D::image(const Graphics::Image &img, unsigned lv) +{ + image(img, lv, false); +} + +void Texture2D::image(const Graphics::Image &img, unsigned lv, bool from_buffer) { unsigned w = img.get_width(); unsigned h = img.get_height(); - PixelFormat fmt = pixelformat_from_graphics(img.get_format()); + PixelFormat fmt = pixelformat_from_image(img); if(width==0) - { - 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) + storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv); + else if(w!=width || h!=height || (lv && lv!=levels)) throw incompatible_data("Texture2D::image"); PixelStore pstore = PixelStore::from_image(img); BindRestore _bind_ps(pstore); - image(0, fmt, UNSIGNED_BYTE, from_buffer ? 0 : img.get_data()); + image(0, from_buffer ? 0 : img.get_pixels()); } unsigned Texture2D::get_n_levels() const @@ -171,25 +189,23 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) const h = 1; } -Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res) +Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *) { 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; + return id ? width*height*get_pixel_size(format) : 0; } void Texture2D::unload() { glDeleteTextures(1, &id); id = 0; - // TODO check which params actually need refreshing - dirty_params = -1; + allocated = 0; + default_sampler.unload(); } @@ -209,11 +225,12 @@ 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) { - obj.image(0, get_base_pixelformat(obj.ifmt), UNSIGNED_BYTE, data.data()); + obj.image(0, data.data()); } void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h) @@ -221,19 +238,26 @@ void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h) obj.storage(fmt, w, h); } +void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, unsigned l) +{ + obj.storage(fmt, w, h, l); +} + Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i): texture(t), io(i), - srgb_conversion(false), pixel_buffer(PIXEL_UNPACK_BUFFER), mapped_address(0), + img_loader(Graphics::ImageLoader::open_io(io)), phase(0) { } -void Texture2D::AsyncLoader::set_srgb_conversion(bool c) +Texture2D::AsyncLoader::~AsyncLoader() { - srgb_conversion = c; + if(mapped_address) + pixel_buffer.unmap(); + delete img_loader; } bool Texture2D::AsyncLoader::needs_sync() const @@ -245,24 +269,20 @@ 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); + image.load_headers(*img_loader); 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)); + pixel_buffer.storage(n_bytes); + mapped_address = reinterpret_cast(pixel_buffer.map()); } else if(phase==2) - { - const char *data = reinterpret_cast(image.get_data()); - copy(data, data+n_bytes, mapped_address); - } + image.load_into(*img_loader, mapped_address); else if(phase==3) { Bind _bind_buf(pixel_buffer, PIXEL_UNPACK_BUFFER); + mapped_address = 0; if(!pixel_buffer.unmap()) { phase = 1; @@ -270,8 +290,13 @@ bool Texture2D::AsyncLoader::process() } if(!texture.id) - glGenTextures(1, &texture.id); - texture.image(image, srgb_conversion, true); + { + if(ARB_direct_state_access) + glCreateTextures(texture.target, 1, &texture.id); + else + glGenTextures(1, &texture.id); + } + texture.image(image, 0, true); } ++phase;