private:
Texture2D &texture;
IO::Seekable &io;
- Buffer pixel_buffer;
- char *mapped_address = 0;
+ Texture2D::AsyncTransfer transfer;
Graphics::Image image;
Graphics::ImageLoader *img_loader = 0;
DataFile::RawData *raw_data = 0;
}
}
-void OpenGLTexture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const Buffer &buffer, unsigned offset)
-{
- glBindBuffer(GL_PIXEL_UNPACK_BUFFER, buffer.id);
- sub_image(level, x, y, wd, ht, reinterpret_cast<void *>(offset));
- glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
-}
-
Resource::AsyncLoader *OpenGLTexture2D::load(IO::Seekable &io, const Resources *)
{
return new AsyncLoader(static_cast<Texture2D &>(*this), io);
}
+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<const Texture2D::AsyncTransfer *>(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<const Texture2D::AsyncTransfer *>(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)
OpenGLTexture2D::AsyncLoader::~AsyncLoader()
{
- if(mapped_address)
- pixel_buffer.unmap();
delete img_loader;
delete raw_data;
}
}
else if(phase==1)
{
- pixel_buffer.storage(n_bytes, STREAMING);
- mapped_address = reinterpret_cast<char *>(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)
{
if(raw_data)
- raw_data->load_into(mapped_address);
+ raw_data->load_into(transfer.get_address());
else
- image.load_into(*img_loader, mapped_address);
+ 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();
-
- 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);
- }
- texture.OpenGLTexture2D::sub_image(0, 0, 0, texture.width, texture.height, pixel_buffer, 0);
+ transfer = Texture2D::AsyncTransfer();
if(texture.auto_gen_mipmap)
texture.generate_mipmap();