#include <cmath>
+#include <msp/gl/extensions/ext_texture3d.h>
#include <msp/graphics/image.h>
#include "bindable.h"
#include "error.h"
-#include "extension.h"
+#include "pixelstore.h"
#include "texture3d.h"
-#include "version_1_2.h"
using namespace std;
depth(0),
allocated(0)
{
- static RequireVersion _ver(1, 2);
+ static Require _req(EXT_texture3D);
}
void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
throw invalid_operation("Texture3D::storage");
if(wd==0 || ht==0 || dp==0)
throw invalid_argument("Texture3D::storage");
+ require_pixelformat(fmt);
width = wd;
height = ht;
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
- storage(fmt, w, h, d);
+ storage(storage_pixelformat_from_graphics(img.get_format()), w, h, d);
else if(w!=width || h!=height || d!=depth)
throw incompatible_data("Texture3D::load_image");
- image(0, fmt, UNSIGNED_INT, img.get_data());
+ PixelStore pstore = PixelStore::from_image(img);
+ Bind _bind_ps(pstore, true);
+
+ image(0, fmt, UNSIGNED_BYTE, img.get_data());
}
void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)