-#include <msp/core/raii.h>
-#include <msp/gl/extensions/arb_direct_state_access.h>
-#include <msp/gl/extensions/arb_texture_storage.h>
+#include <msp/datafile/rawdata.h>
#include <msp/graphics/imageloader.h>
-#include "buffer.h"
#include "error.h"
-#include "resources.h"
#include "texture2d.h"
using namespace std;
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 &);
};
-Texture2D::Texture2D(ResourceManager *m):
- Texture(GL_TEXTURE_2D, m),
- width(0),
- height(0),
- allocated(0)
-{ }
-
Texture2D::~Texture2D()
{
set_manager(0);
{
if(width>0)
{
- if(fmt!=format || wd!=width || ht!=height || (lv && lv!=levels))
+ if(fmt!=format || wd!=width || ht!=height || (lv && lv!=n_levels))
throw incompatible_data("Texture2D::storage");
return;
}
set_format(fmt);
width = wd;
height = ht;
- levels = get_n_levels();
+ n_levels = count_levels(max(width, height));
if(lv>0)
- levels = min(levels, lv);
-}
+ n_levels = min(n_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");
-
- bool direct = ARB_texture_storage && ARB_direct_state_access;
- if(!direct)
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
- }
-
- allocate_(level);
-
- if(!direct)
- glBindTexture(target, 0);
-}
-
-void Texture2D::allocate_(unsigned level)
-{
- if(allocated&(1<<level))
- return;
-
- if(ARB_texture_storage)
- {
- GLenum fmt = get_gl_pixelformat(storage_fmt);
- if(ARB_direct_state_access)
- glTextureStorage2D(id, levels, fmt, width, height);
- else
- glTexStorage2D(target, levels, fmt, width, height);
- apply_swizzle();
- allocated |= (1<<levels)-1;
- }
- else
- image_(level, 0);
+ allocate();
}
void Texture2D::image(unsigned level, const void *data)
{
- if(width==0 || height==0)
- throw invalid_operation("Texture2D::image");
- if(level>=levels)
- throw out_of_range("Texture2D::image");
-
- if(ARB_texture_storage)
- {
- LinAl::Vector<unsigned, 2> size = get_level_size(level);
- return sub_image(level, 0, 0, size.x, size.y, data);
- }
-
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
-
- image_(level, data);
-
- if(auto_gen_mipmap && level==0)
- {
- generate_mipmap_();
- allocated |= (1<<levels)-1;
- }
-
- glBindTexture(target, 0);
-}
-
-void Texture2D::image_(unsigned level, const void *data)
-{
- if(!allocated)
- {
- glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, levels-1);
- apply_swizzle();
- }
-
LinAl::Vector<unsigned, 2> size = get_level_size(level);
- 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<<level;
-}
-
-void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
-{
- if(comp!=get_components(format) || type!=get_component_type(format))
- throw incompatible_data("Texture2D::image");
- image(level, data);
+ return sub_image(level, 0, 0, size.x, size.y, data);
}
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data)
+void Texture2D::sub_image(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht, const void *data)
{
if(width==0 || height==0)
throw invalid_operation("Texture2D::sub_image");
- if(level>=levels)
+ if(level>=n_levels || x>width || x+wd>width || y>height || y+ht>height)
throw out_of_range("Texture2D::sub_image");
- bool direct = (ARB_direct_state_access && (ARB_texture_storage || (allocated&(1<<level))));
- if(!direct)
- {
- glActiveTexture(GL_TEXTURE0);
- glBindTexture(target, id);
- }
-
- 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
- glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
-
- if(auto_gen_mipmap && level==0)
- generate_mipmap_();
-
- if(!direct)
- glBindTexture(target, 0);
+ Texture2DBackend::sub_image(level, x, y, wd, ht, data);
}
-void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
+Texture2D::AsyncTransfer Texture2D::sub_image_async(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht)
{
- if(comp!=get_components(format) || type!=get_component_type(format))
- throw incompatible_data("Texture2D::sub_image");
- sub_image(level, x, y, wd, ht, data);
+ return AsyncTransfer(*this, level, x, y, wd, ht);
}
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());
-}
-
-unsigned Texture2D::get_n_levels() const
-{
- unsigned n = 0;
- for(unsigned s=max(width, height); s; s>>=1, ++n) ;
- return n;
+ storage(pixelformat_from_image(img, use_srgb_format), img.get_width(), img.get_height(), lv);
+ image(0, img.get_pixels());
}
LinAl::Vector<unsigned, 2> Texture2D::get_level_size(unsigned level) const
Resource::AsyncLoader *Texture2D::load(IO::Seekable &io, const Resources *)
{
- AsyncLoader *ldr = new AsyncLoader(*this, io);
- return ldr;
-}
-
-UInt64 Texture2D::get_data_size() const
-{
- return id ? width*height*get_pixel_size(format) : 0;
-}
-
-void Texture2D::unload()
-{
- glDeleteTextures(1, &id);
- id = 0;
- allocated = 0;
+ return new AsyncLoader(static_cast<Texture2D &>(*this), io);
}
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)
-{
- if(obj.manager)
- {
- obj.set_manager(0);
- if(!obj.id)
- obj.generate_id();
- }
- obj.image(0, data.data());
-}
-
void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
{
obj.storage(fmt, w, h);
}
+Texture2D::AsyncTransfer::AsyncTransfer(Texture2D &t, unsigned l, unsigned x_, unsigned y_, unsigned wd, unsigned ht):
+ texture(&t),
+ level(l),
+ x(x_),
+ y(y_),
+ width(wd),
+ height(ht),
+ data_size(width*height*get_pixel_size(texture->storage_fmt)),
+ dest_addr(0)
+{
+ dest_addr = allocate();
+}
+
+Texture2D::AsyncTransfer::AsyncTransfer(AsyncTransfer &&other):
+ Texture2DBackend::AsyncTransfer(move(other)),
+ texture(other.texture),
+ level(other.level),
+ x(other.x),
+ y(other.y),
+ width(other.width),
+ height(other.height),
+ data_size(other.data_size),
+ dest_addr(other.dest_addr)
+{
+ other.dest_addr = 0;
+}
+
+Texture2D::AsyncTransfer &Texture2D::AsyncTransfer::operator=(AsyncTransfer &&other)
+{
+ if(dest_addr)
+ finalize();
+
+ Texture2DBackend::AsyncTransfer::operator=(move(other));
+
+ texture = other.texture;
+ level = other.level;
+ x = other.x;
+ y = other.y;
+ width = other.width;
+ height = other.height;
+ data_size = other.data_size;
+ dest_addr = other.dest_addr;
+
+ other.dest_addr = 0;
+
+ return *this;
+}
+
+Texture2D::AsyncTransfer::~AsyncTransfer()
+{
+ if(dest_addr)
+ finalize();
+}
+
+
Texture2D::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);
+}
Texture2D::AsyncLoader::~AsyncLoader()
{
- if(mapped_address)
- pixel_buffer.unmap();
delete img_loader;
+ delete raw_data;
}
bool Texture2D::AsyncLoader::needs_sync() const
{
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<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)
- image.load_into(*img_loader, mapped_address);
- else if(phase==3)
{
- mapped_address = 0;
- if(!pixel_buffer.unmap())
+ if(texture.swizzle==RGBA_TO_RGB)
{
- phase = 1;
- return false;
+ const void *data;
+ if(raw_data)
+ {
+ raw_data->load();
+ data = raw_data->get_data();
+ }
+ else
+ {
+ image.load(*img_loader);
+ data = image.get_pixels();
+ }
+ texture.stage_pixels(transfer.get_address(), data, texture.width*texture.height);
}
+ else if(raw_data)
+ raw_data->load_into(transfer.get_address());
+ else
+ image.load_into(*img_loader, transfer.get_address());
+ }
+ else if(phase==3)
+ {
+ transfer = Texture2D::AsyncTransfer();
- 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;
projects / libs / gl.git / blobdiff