#include <cmath>
-#include <msp/gbase/image.h>
+#include <msp/graphics/image.h>
#include "bindable.h"
-#include "except.h"
+#include "error.h"
#include "extension.h"
#include "texture3d.h"
#include "version_1_2.h"
static RequireVersion _ver(1, 2);
}
-void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d)
+void Texture3D::storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp)
{
if(width>0)
- throw InvalidState("Textures storage may only be specified once");
- if(w==0 || h==0 || d==0)
- throw InvalidParameterValue("Invalid texture dimensions");
-
- width = w;
- height = h;
- depth = d;
- ifmt = f;
+ throw invalid_operation("Texture3D::storage");
+ if(wd==0 || ht==0 || dp==0)
+ throw invalid_argument("Texture3D::storage");
+
+ width = wd;
+ height = ht;
+ depth = dp;
+ ifmt = fmt;
}
void Texture3D::allocate(unsigned level)
void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void *data)
{
- require_storage();
+ if(width==0 || height==0 || depth==0)
+ throw invalid_operation("Texture3D::image");
unsigned w = width;
unsigned h = height;
void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelFormat fmt, DataType type, const void *data)
{
- require_storage();
+ if(width==0 || height==0 || depth==0)
+ throw invalid_operation("Texture3D::image");
+
allocate(level);
Bind _bind(this, true);
if(dp==-1)
{
if(h%w)
- throw IncompatibleData("Image height is not divisible by its width");
+ throw incompatible_data("Texture3D::load_image");
d = h/w;
h = w;
}
for(d=h; d*d>h; d>>=2) ;
for(; d*d<h; ++d) ;
if(d*d!=h)
- throw IncompatibleData("Could not find a square root of texture height");
+ throw incompatible_data("Texture3D::load_image");
h = d;
}
else if(dp>0)
+ {
d = dp;
+ if(h%d)
+ throw incompatible_data("Texture3D::load_image");
+ h /= d;
+ }
+ else
+ throw invalid_argument("Texture3D::load_image");
PixelFormat fmt = pixelformat_from_graphics(img.get_format());
if(width==0)
storage(fmt, w, h, d);
else if(w!=width || h!=height || d!=depth)
- throw IncompatibleData("Image does not match texture storage");
+ throw incompatible_data("Texture3D::load_image");
image(0, fmt, UNSIGNED_INT, img.get_data());
}
-void Texture3D::require_storage()
-{
- if(width==0 || height==0 || depth==0)
- throw InvalidState("Texture storage has not been specified");
-}
-
void Texture3D::get_level_size(unsigned level, unsigned &w, unsigned &h, unsigned &d)
{
w >>= level;