X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture3d.cpp;h=fdf61cde4366600f2f37438a5824f25299b07f87;hb=e92458a4a0e6191bff549a8b316dbbbd7c56e90f;hp=17adb6a109369ed6ca3053d43ee740f851cd6cb6;hpb=a4ec5410595ddf37bfbc0e85ad87d31a9cbf94f1;p=libs%2Fgl.git

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 17adb6a1..fdf61cde 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -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);
@@ -53,7 +53,7 @@ void Texture3D::image(int level, PixelFormat fmt, GLenum type, const void *data)
 void Texture3D::load_image(const string &fn, int dp)
 {
 	Image img;
-	img.load(fn);
+	img.load_file(fn);
 
 	unsigned w=img.get_width();
 	unsigned h=img.get_height();
@@ -83,7 +83,7 @@ void Texture3D::load_image(const string &fn, int dp)
 	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