X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=30363acc3d8046ff10fd73f9b6271bce4c353b4c;hb=2be605933f62521bb22780256386a14b371c8b17;hp=11fcf5263c602cdf895e28ca481036de8dd4fcbe;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 11fcf526..30363acc 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,7 +1,7 @@
 #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"
@@ -24,9 +24,9 @@ Texture3D::Texture3D():
 void Texture3D::storage(PixelFormat f, unsigned w, unsigned h, unsigned d)
 {
 	if(width>0)
-		throw InvalidState("Textures storage may only be specified once");
+		throw invalid_operation("Texture3D::storage");
 	if(w==0 || h==0 || d==0)
-		throw InvalidParameterValue("Invalid texture dimensions");
+		throw invalid_argument("Texture3D::storage");
 
 	width = w;
 	height = h;
@@ -44,7 +44,8 @@ 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;
@@ -64,7 +65,9 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 
 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);
@@ -83,7 +86,7 @@ void Texture3D::load_image(const string &fn, int dp)
 	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;
 	}
@@ -92,27 +95,28 @@ void Texture3D::load_image(const string &fn, int dp)
 		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;