X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexture2d.h;h=eba3286fee15fddce63b67e503f551990b0bf65d;hb=89d3d10b75a42f86b224feb00b20283af66c0b01;hp=639d47a6cee591d3a39ad6cbeced110c75550a0a;hpb=a1eb8711ba225bb4423868c50369ad5592465171;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index 639d47a6..eba3286f 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -5,6 +5,7 @@
 #include <msp/graphics/image.h>
 #include "datatype.h"
 #include "pixelformat.h"
+#include "resource.h"
 #include "texture.h"
 
 namespace Msp {
@@ -33,13 +34,15 @@ public:
 	};
 
 private:
+	class AsyncLoader;
+
 	PixelFormat ifmt;
 	unsigned width;
 	unsigned height;
 	unsigned allocated;
 
 public:
-	Texture2D();
+	Texture2D(ResourceManager * = 0);
 
 	/** Defines storage structure for the texture.  Must be called before an
 	image can be uploaded.  Once storage is defined, it can't be changed. */
@@ -71,11 +74,20 @@ public:
 	format will be used. */
 	void image(const Graphics::Image &, bool srgb = false);
 
+private:
+	void image(const Graphics::Image &, bool, bool);
+
+public:
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
 
 private:
 	void get_level_size(unsigned, unsigned &, unsigned &);
+
+public:
+	virtual Resource::AsyncLoader *load(IO::Seekable &);
+	virtual UInt64 get_data_size() const;
+	virtual void unload();
 };
 
 } // namespace GL