X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=806e4a179bded9f8a71264ecce78bccafc529870;hp=7cad81d92a5e44e2717bbaf88f1c35d166fa8dc3;hb=aea9ceca71b59358248be94fdf272fd4791ca990;hpb=7d7a8f9e77a526fd5f2920b9005805e56a4b686c diff --git a/source/texture2d.cpp b/source/texture2d.cpp index 7cad81d9..806e4a17 100644 --- a/source/texture2d.cpp +++ b/source/texture2d.cpp @@ -1,4 +1,6 @@ -#include +#include +#include +#include #include "bindable.h" #include "buffer.h" #include "error.h" @@ -16,6 +18,7 @@ class Texture2D::AsyncLoader: public Resource::AsyncLoader private: Texture2D &texture; IO::Seekable &io; + bool srgb_conversion; Buffer pixel_buffer; char *mapped_address; Graphics::Image image; @@ -25,6 +28,7 @@ private: public: AsyncLoader(Texture2D &, IO::Seekable &); + void set_srgb_conversion(bool); virtual bool needs_sync() const; virtual bool process(); }; @@ -32,31 +36,56 @@ public: Texture2D::Texture2D(ResourceManager *m): Texture(GL_TEXTURE_2D, m), - ifmt(RGB), width(0), height(0), allocated(0) { } -void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht) +Texture2D::~Texture2D() +{ + set_manager(0); +} + +void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv) { 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; + levels = get_n_levels(); + if(lv>0) + levels = min(levels, lv); } void Texture2D::allocate(unsigned level) { + if(width==0 || height==0) + throw invalid_operation("Texture2D::allocate"); + if(level>=levels) + throw invalid_argument("Texture2D::allocate"); 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); -} - -void Texture2D::load_image(const string &fn, bool srgb) -{ - Graphics::Image img; - img.load_file(fn); + 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); - image(img, srgb); + if(gen_mipmap && level==0) + auto_generate_mipmap(); } void Texture2D::image(const Graphics::Image &img, bool srgb) @@ -111,10 +141,8 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer) PixelFormat fmt = pixelformat_from_graphics(img.get_format()); if(width==0) { - PixelFormat f = storage_pixelformat_from_graphics(img.get_format()); - if(srgb) - f = get_srgb_pixelformat(f); - storage(f, w, h); + 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) throw incompatible_data("Texture2D::image"); @@ -125,7 +153,14 @@ void Texture2D::image(const Graphics::Image &img, bool srgb, bool from_buffer) 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; @@ -136,14 +171,17 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h) h = 1; } -Resource::AsyncLoader *Texture2D::load(IO::Seekable &io) +Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *res) { - return new AsyncLoader(*this, io); + 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_component_count(ifmt) : 0; + return id ? width*height*get_pixel_size(ifmt) : 0; } void Texture2D::unload() @@ -169,19 +207,8 @@ Texture2D::Loader::Loader(Texture2D &t, Collection &c): void Texture2D::Loader::init() { - add("image_data", &Loader::image_data); add("raw_data", &Loader::raw_data); add("storage", &Loader::storage); - add("storage", &Loader::storage_b); -} - -void Texture2D::Loader::image_data(const string &data) -{ - Graphics::Image img; - IO::Memory mem(data.data(), data.size()); - img.load_io(mem); - - obj.image(img, srgb); } void Texture2D::Loader::raw_data(const string &data) @@ -191,25 +218,24 @@ 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) -{ - storage(fmt, w, h); -} - 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 { return phase%2; @@ -245,7 +271,7 @@ bool Texture2D::AsyncLoader::process() if(!texture.id) glGenTextures(1, &texture.id); - texture.image(image, false, true); + texture.image(image, srgb_conversion, true); } ++phase;