X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Ftexture2d_backend.cpp;h=187d16934990668fb40132463ebded6cd0f387e0;hb=3054756d04a94ec9471448970421de4a7aa7b247;hp=2f7e503b7d42a9aec7e8055a38fa2446e5805a0a;hpb=ef650a483b4201a1e9727f9a86e59894344d30e8;p=libs%2Fgl.git diff --git a/source/backends/opengl/texture2d_backend.cpp b/source/backends/opengl/texture2d_backend.cpp index 2f7e503b..187d1693 100644 --- a/source/backends/opengl/texture2d_backend.cpp +++ b/source/backends/opengl/texture2d_backend.cpp @@ -1,3 +1,4 @@ +#include #include #include #include @@ -7,6 +8,8 @@ #include "texture2d.h" #include "texture2d_backend.h" +using namespace std; + namespace Msp { namespace GL { @@ -15,12 +18,12 @@ class OpenGLTexture2D::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 &); @@ -37,9 +40,7 @@ OpenGLTexture2D::OpenGLTexture2D(): void OpenGLTexture2D::allocate() { - unsigned width = static_cast(this)->width; - unsigned height = static_cast(this)->height; - unsigned levels = static_cast(this)->levels; + const Texture2D &self = *static_cast(this); if(!id) create(); @@ -48,22 +49,22 @@ void OpenGLTexture2D::allocate() if(ARB_texture_storage) { if(ARB_direct_state_access) - glTextureStorage2D(id, levels, gl_fmt, width, height); + glTextureStorage2D(id, n_levels, gl_fmt, self.width, self.height); else { bind_scratch(); - glTexStorage2D(target, levels, gl_fmt, width, height); + glTexStorage2D(target, n_levels, gl_fmt, self.width, self.height); } } else { bind_scratch(); - glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1); + glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, n_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(this)->get_level_size(i); + auto lv_size = self.get_level_size(i); glTexImage2D(target, i, gl_fmt, lv_size.x, lv_size.y, 0, comp, type, 0); } } @@ -84,16 +85,23 @@ void OpenGLTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsig } } -void OpenGLTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const Buffer &buffer, unsigned offset) +Resource::AsyncLoader *OpenGLTexture2D::load(IO::Seekable &io, const Resources *) { - glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer.id); - sub_image(level, x, y, wd, ht, reinterpret_cast(offset)); - glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); + return new AsyncLoader(static_cast(*this), io); } -Resource::AsyncLoader *OpenGLTexture2D::create_async_loader(IO::Seekable &io) +uint64_t OpenGLTexture2D::get_data_size() const { - return new AsyncLoader(static_cast(*this), io); + if(!id) + return 0; + + const Texture2D &self = *static_cast(this); + + size_t level_size = self.width*self.height*get_pixel_size(format); + size_t total_size = level_size; + for(unsigned i=0; i>=2) + total_size += level_size; + return total_size; } void OpenGLTexture2D::unload() @@ -103,19 +111,68 @@ void OpenGLTexture2D::unload() } +OpenGLTexture2D::AsyncTransfer::AsyncTransfer(AsyncTransfer &&other): + pixel_buffer(other.pixel_buffer) +{ + other.pixel_buffer = 0; +} + +OpenGLTexture2D::AsyncTransfer &OpenGLTexture2D::AsyncTransfer::operator=(AsyncTransfer &&other) +{ + delete pixel_buffer; + pixel_buffer = other.pixel_buffer; + other.pixel_buffer = 0; + + return *this; +} + +OpenGLTexture2D::AsyncTransfer::~AsyncTransfer() +{ + delete pixel_buffer; +} + +void *OpenGLTexture2D::AsyncTransfer::allocate() +{ + const Texture2D::AsyncTransfer &self = *static_cast(this); + + pixel_buffer = new Buffer; + pixel_buffer->storage(self.data_size, STREAMING); + return pixel_buffer->map(); +} + +void OpenGLTexture2D::AsyncTransfer::finalize() +{ + const Texture2D::AsyncTransfer &self = *static_cast(this); + + pixel_buffer->unmap(); + + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer->id); + self.texture->OpenGLTexture2D::sub_image(self.level, self.x, self.y, self.width, self.height, 0); + glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); +} + + OpenGLTexture2D::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); +} OpenGLTexture2D::AsyncLoader::~AsyncLoader() { - if(mapped_address) - pixel_buffer.unmap(); delete img_loader; + delete raw_data; } bool OpenGLTexture2D::AsyncLoader::needs_sync() const @@ -127,32 +184,35 @@ bool OpenGLTexture2D::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); + { + if(raw_data) + raw_data->load_into(transfer.get_address()); + else + image.load_into(*img_loader, transfer.get_address()); + } else if(phase==3) { - mapped_address = 0; - if(!pixel_buffer.unmap()) - { - phase = 1; - return false; - } - - if(!texture.id) - texture.create(); - - unsigned w = image.get_width(); - unsigned h = image.get_height(); - texture.storage(pixelformat_from_image(image, texture.use_srgb_format), w, h); - texture.OpenGLTexture2D::sub_image(0, 0, 0, w, h, pixel_buffer, 0); + transfer = Texture2D::AsyncTransfer(); if(texture.auto_gen_mipmap) texture.generate_mipmap();