X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.cpp;h=3c3579c1d131137f89ab49b57dd565f15a3ed544;hp=0fc300e0a09e7b4659aefe3bb842228797f6f3b1;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=4e9fe48180c7b4646ac2591e172de61f7a693b32 diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp index 0fc300e0..3c3579c1 100644 --- a/source/core/texture2d.cpp +++ b/source/core/texture2d.cpp @@ -1,10 +1,4 @@ -#include -#include -#include -#include -#include "buffer.h" #include "error.h" -#include "resources.h" #include "texture2d.h" using namespace std; @@ -12,34 +6,6 @@ using namespace std; namespace Msp { namespace GL { -class Texture2D::AsyncLoader: public Resource::AsyncLoader -{ -private: - Texture2D &texture; - IO::Seekable &io; - Buffer pixel_buffer; - char *mapped_address; - Graphics::Image image; - Graphics::ImageLoader *img_loader; - unsigned n_bytes; - int phase; - -public: - AsyncLoader(Texture2D &, IO::Seekable &); - ~AsyncLoader(); - - 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); @@ -62,67 +28,14 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv) 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<=levels) - throw out_of_range("Texture2D::image"); - LinAl::Vector size = get_level_size(level); - - if(ARB_texture_storage) - return sub_image(level, 0, 0, size.x, size.y, data); - - bind_scratch(); - - if(!allocated) - { - glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1); - apply_swizzle(); - } - - GLenum fmt = get_gl_pixelformat(storage_fmt); - GLenum comp = get_gl_components(get_components(storage_fmt)); - GLenum type = get_gl_type(get_component_type(storage_fmt)); - glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data); - - allocated |= 1<=levels) throw out_of_range("Texture2D::sub_image"); - allocate(level); - - 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); - } -} - -void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data) -{ - if(comp!=get_components(format) || type!=get_component_type(format)) - throw incompatible_data("Texture2D::sub_image"); - sub_image(level, x, y, wd, ht, data); + Texture2DBackend::sub_image(level, x, y, wd, ht, data); } 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_image(img); - storage(make_pixelformat(get_components(fmt), get_component_type(fmt), use_srgb_format), w, h, lv); - - image(0, from_buffer ? 0 : img.get_pixels()); + storage(pixelformat_from_image(img, use_srgb_format), img.get_width(), img.get_height(), lv); + image(0, img.get_pixels()); } unsigned Texture2D::get_n_levels() const @@ -189,22 +76,14 @@ 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; + return create_async_loader(io); } -UInt64 Texture2D::get_data_size() const +uint64_t Texture2D::get_data_size() const { return id ? width*height*get_pixel_size(format) : 0; } -void Texture2D::unload() -{ - glDeleteTextures(1, &id); - id = 0; - allocated = 0; -} - Texture2D::Loader::Loader(Texture2D &t): DataFile::DerivedObjectLoader(t) @@ -228,11 +107,7 @@ void Texture2D::Loader::init() 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()); } @@ -246,62 +121,5 @@ void Texture2D::Loader::storage_levels(PixelFormat fmt, unsigned w, unsigned h, obj.storage(fmt, w, h, l); } - -Texture2D::AsyncLoader::AsyncLoader(Texture2D &t, IO::Seekable &i): - texture(t), - io(i), - mapped_address(0), - img_loader(Graphics::ImageLoader::open_io(io)), - phase(0) -{ } - -Texture2D::AsyncLoader::~AsyncLoader() -{ - if(mapped_address) - pixel_buffer.unmap(); - delete img_loader; -} - -bool Texture2D::AsyncLoader::needs_sync() const -{ - return phase%2; -} - -bool Texture2D::AsyncLoader::process() -{ - if(phase==0) - { - 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()); - } - else if(phase==2) - image.load_into(*img_loader, mapped_address); - else if(phase==3) - { - mapped_address = 0; - if(!pixel_buffer.unmap()) - { - phase = 1; - return false; - } - - if(!texture.id) - texture.generate_id(); - glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id()); - texture.image(image, 0, true); - glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); - if(texture.auto_gen_mipmap) - texture.generate_mipmap(); - } - - ++phase; - return phase>3; -} - } // namespace GL } // namespace Msp