#include <cmath>
+#include <msp/gl/extensions/ext_texture3d.h>
#include <msp/graphics/image.h>
#include "bindable.h"
#include "error.h"
-#include "ext_texture3d.h"
+#include "pixelstore.h"
#include "texture3d.h"
using namespace std;
Texture3D::Texture3D():
Texture(GL_TEXTURE_3D),
+ ifmt(RGB),
width(0),
height(0),
depth(0),
unsigned d = depth;
get_level_size(level, w, h, d);
- Bind _bind(this, true);
+ BindRestore _bind(this);
glTexImage3D(target, level, ifmt, width, height, depth, 0, fmt, type, data);
allocated |= 1<<level;
allocate(level);
- Bind _bind(this, true);
+ BindRestore _bind(this);
glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
}
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);
+ BindRestore _bind_ps(pstore);
+
+ image(0, fmt, UNSIGNED_BYTE, img.get_data());
}
void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
d = 1;
}
+UInt64 Texture3D::get_data_size() const
+{
+ return id ? width*height*depth*get_pixel_size(ifmt) : 0;
+}
+
} // namespace GL
} // namespace Msp