+#include <msp/io/memory.h>
#include "bindable.h"
#include "error.h"
+#include "pixelstore.h"
#include "texture2d.h"
using namespace std;
unsigned h = height;
get_level_size(level, w, h);
- Bind _bind(this, true);
+ BindRestore _bind(this);
glTexImage2D(target, level, ifmt, w, h, 0, fmt, type, data);
allocated |= 1<<level;
allocate(level);
- Bind _bind(this, true);
+ BindRestore _bind(this);
glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
}
unsigned h = img.get_height();
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
- storage(fmt, w, h);
+ storage(storage_pixelformat_from_graphics(img.get_format()), w, h);
else if(w!=width || h!=height)
throw incompatible_data("Texture2D::image");
+ PixelStore pstore = PixelStore::from_image(img);
+ BindRestore _bind_ps(pstore);
+
image(0, fmt, UNSIGNED_BYTE, img.get_data());
}
void Texture2D::Loader::image_data(const string &data)
{
Graphics::Image img;
- img.load_memory(data.data(), data.size());
+ IO::Memory mem(data.data(), data.size());
+ img.load_io(mem);
obj.image(img);
}