X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=2fc4f997396e3dcf7f3f1a9417532c8cd3364f9c;hb=b8b06a0ff96763ba7e188d9fcacbd8c0e3dcd515;hp=c38b44652d366c4c13fa9cd18bf3928de8da9080;hpb=a80b074c70ec991f27114efd13686038cf42c493;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index c38b4465..2fc4f997 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -6,9 +6,9 @@ Distributed under the LGPL
 */
 
 #include <cmath>
+#include <msp/gbase/image.h>
 #include "except.h"
 #include "extension.h"
-#include "ilwrap.h"
 #include "texture3d.h"
 #include "version_1_2.h"
 
@@ -41,10 +41,10 @@ void Texture3D::storage(PixelFormat f, sizei w, sizei h, sizei d, int b)
 	ifmt=f;
 	border=b;
 
-	image(0, ifmt, GL_UNSIGNED_BYTE, 0);
+	image(0, ifmt, UNSIGNED_BYTE, 0);
 }
 
-void Texture3D::image(int level, PixelFormat fmt, GLenum type, const void *data)
+void Texture3D::image(int level, PixelFormat fmt, DataType type, const void *data)
 {
 	maybe_bind();
 	glTexImage3D(target, level, ifmt, width, height, depth, border, fmt, type, data);
@@ -52,7 +52,7 @@ void Texture3D::image(int level, PixelFormat fmt, GLenum type, const void *data)
 
 void Texture3D::load_image(const string &fn, int dp)
 {
-	Image img;
+	Graphics::Image img;
 	img.load_file(fn);
 
 	unsigned w=img.get_width();
@@ -68,8 +68,8 @@ void Texture3D::load_image(const string &fn, int dp)
 	}
 	else if(dp==-2)
 	{
-		for(d=h; d*d>h; d>>=2);
-		for(; d*d<h; ++d);
+		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");
 		h=d;
@@ -77,13 +77,13 @@ void Texture3D::load_image(const string &fn, int dp)
 	else if(dp>0)
 		d=dp;
 
-	PixelFormat fmt=img.get_format();
+	PixelFormat fmt=pixelformat_from_graphics(img.get_format());
 	if(width==0)
 		storage(fmt, w, h, d, 0);
 	else if(w!=width || h!=height || d!=depth)
 		throw IncompatibleData("Image does not match texture storage");
 
-	image(0, fmt, GL_UNSIGNED_INT, img.get_data());
+	image(0, fmt, UNSIGNED_INT, img.get_data());
 }
 
 } // namespace GL