X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.h;h=c6654df69222859a0a284c468c9859a737127d8c;hb=be6ffe96ecb4707599fe1a6f620c348760213d46;hp=0ef4fc1fbefde4ed730cb41e2e1cd631bf4b8d24;hpb=acaefb4c669f01855252818ef0a2958cbdababc3;p=libs%2Fgl.git

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 0ef4fc1f..c6654df6 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,14 +32,11 @@ public:
 	};
 
 private:
-	class AsyncLoader;
-
-	unsigned width;
-	unsigned height;
-	unsigned levels;
+	unsigned width = 0;
+	unsigned height = 0;
+	unsigned levels = 0;
 
 public:
-	Texture2D(ResourceManager * = 0);
 	virtual ~Texture2D();
 
 	/** Defines storage structure for the texture.  If lv is zero, the number
@@ -59,17 +56,11 @@ 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. */
 	virtual void image(const Graphics::Image &, unsigned lv = 0);
 
-	using Texture::image;
-
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
 
@@ -79,8 +70,8 @@ private:
 
 public:
 	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-	virtual std::uint64_t get_data_size() const;
-	virtual void unload();
+	virtual std::size_t get_data_size() const;
+	using Texture2DBackend::unload;
 };
 
 } // namespace GL