+#include <msp/datafile/rawdata.h>
#include <msp/gl/extensions/arb_direct_state_access.h>
#include <msp/gl/extensions/arb_texture_storage.h>
#include <msp/gl/extensions/arb_vertex_buffer_object.h>
#include "texture2d.h"
#include "texture2d_backend.h"
+using namespace std;
+
namespace Msp {
namespace GL {
Texture2D &texture;
IO::Seekable &io;
Buffer pixel_buffer;
- char *mapped_address;
+ char *mapped_address = 0;
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 &);
};
-OpenGLTexture2D::OpenGLTexture2D(ResourceManager *m):
- Texture(GL_TEXTURE_2D, m)
+OpenGLTexture2D::OpenGLTexture2D():
+ Texture(GL_TEXTURE_2D)
{ }
void OpenGLTexture2D::allocate()
unsigned height = static_cast<const Texture2D *>(this)->height;
unsigned levels = static_cast<const Texture2D *>(this)->levels;
+ if(!id)
+ create();
+
GLenum gl_fmt = get_gl_pixelformat(storage_fmt);
if(ARB_texture_storage)
{
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
{
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)
{
mapped_address = reinterpret_cast<char *>(pixel_buffer.map());
}
else if(phase==2)
- image.load_into(*img_loader, mapped_address);
+ {
+ if(raw_data)
+ raw_data->load_into(mapped_address);
+ else
+ image.load_into(*img_loader, mapped_address);
+ }
else if(phase==3)
{
mapped_address = 0;
}
if(!texture.id)
- texture.generate_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);
+ 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);
if(texture.auto_gen_mipmap)
texture.generate_mipmap();