X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.h;h=a2454b76b3e613dd552599a2e545d7aef4716d0a;hp=0ef4fc1fbefde4ed730cb41e2e1cd631bf4b8d24;hb=160e9eea29bd10034733d59507fa1bcca36be401;hpb=93448d16e72e38afbaecbccf6fdedd46d6a82a73

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 0ef4fc1f..a2454b76 100644
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -3,20 +3,20 @@
 
 #include <string>
 #include <msp/linal/vector.h>
-#include "texture.h"
+#include "texture2d_backend.h"
 
 namespace Msp {
 namespace GL {
 
-class Buffer;
-
 /**
 Two-dimensional texture.  Consists of an array of texels in the shape of a
 rectangle.  Texture coordinate have a range of [0, 1].  Coordinates outside of
 this range are subject to wrapping.  This is the most common type of texture.
 */
-class Texture2D: public Texture
+class Texture2D: public Texture2DBackend
 {
+	friend Texture2DBackend;
+
 public:
 	class Loader: public Msp::DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>
 	{
@@ -32,8 +32,6 @@ public:
 	};
 
 private:
-	class AsyncLoader;
-
 	unsigned width;
 	unsigned height;
 	unsigned levels;
@@ -59,10 +57,6 @@ public:
 	and the update region must be fully inside the texture. */
 	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *data);
 
-private:
-	void sub_image(unsigned, int, int, unsigned, unsigned, const Buffer &, unsigned);
-
-public:
 	/** Updates the contents of the entire texture from an image.  If storage
 	has not been defined, it will be set to match the image.  Otherwise the
 	image must match the defined storage. */
@@ -80,7 +74,7 @@ private:
 public:
 	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
 	virtual std::uint64_t get_data_size() const;
-	virtual void unload();
+	using Texture2DBackend::unload;
 };
 
 } // namespace GL