X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=f1b76783f7e5c5a242c96bb3528d7e7a8929ec40;hb=a5797c9babd17673285b3b15c7572c2d8fe1595c;hp=b62466cb0a75bc524cf11a484567bfe17eb02625;hpb=a80b074c70ec991f27114efd13686038cf42c493;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index b62466cb..f1b76783 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -10,14 +10,13 @@ Distributed under the LGPL
 
 #include <string>
 #include <msp/datafile/loader.h>
+#include <msp/gbase/image.h>
 #include "pixelformat.h"
 #include "texture.h"
 
 namespace Msp {
 namespace GL {
 
-class Image;
-
 /**
 Two-dimensional texture class.  This is the most common type of texture.
 */
@@ -30,6 +29,8 @@ public:
 		Loader(Texture2D &);
 	private:
 		void image_data(const std::string &);
+		void raw_data(const std::string &);
+		void storage(PixelFormat, unsigned, unsigned, unsigned);
 	};
 
 private:
@@ -52,13 +53,13 @@ public:
 	this, and the image must have dimensions conforming to the specified
 	storage.
 	*/
-	void image(int level, PixelFormat fmt, GLenum type, const void *data);
+	void image(int level, PixelFormat fmt, DataType type, const void *data);
 
 	/**
 	Uploads a sub-image into the texture.  Unlike full image upload, there are
 	no constraints on the size of the sub-image.
 	*/
-	void sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, GLenum type, const void *data);
+	void sub_image(int level, int x, int y, sizei wd, sizei ht, PixelFormat fmt, DataType type, const void *data);
 
 	/**
 	Loads an image from a file and uploads it to the texture.  If storage() has
@@ -70,7 +71,7 @@ public:
 	sizei get_height() const { return height; }
 
 private:
-	void image(const Image &);
+	void image(const Graphics::Image &);
 };
 
 } // namespace GL