X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=5784645b03356d5baebc2ecb75c4e17585a34472;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hp=251561b99490c5ca93166bd9679e121a3fbc92d2;hpb=a361efc05fcad11b2918f3cd7abdebe794b131d8;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index 251561b9..5784645b 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
+#include <msp/gbase/image.h>
 #include "pixelformat.h"
 #include "texture.h"
 
@@ -20,6 +21,17 @@ Two-dimensional texture class.  This is the most common type of texture.
 */
 class Texture2D: public Texture
 {
+public:
+	class Loader: public Texture::Loader
+	{
+	public:
+		Loader(Texture2D &);
+	private:
+		void image_data(const std::string &);
+		void raw_data(const std::string &);
+		void storage(PixelFormat, unsigned, unsigned, unsigned);
+	};
+
 private:
 	PixelFormat ifmt;
 	sizei width;
@@ -40,13 +52,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
@@ -56,6 +68,9 @@ public:
 
 	sizei get_width() const  { return width; }
 	sizei get_height() const { return height; }
+
+private:
+	void image(const Graphics::Image &);
 };
 
 } // namespace GL