X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.h;h=fbcee696686d0dbb93e067341badb2af2b809849;hp=877555c0f5ba43d4cdefb5a78af34225cc2e4756;hb=7ef75a4c4dbfc437e466381dd67c23357e607b82;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 877555c0..fbcee696 100644
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -2,20 +2,19 @@
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
-#include <msp/graphics/image.h>
 #include <msp/linal/vector.h>
-#include "texture.h"
+#include "texture2d_backend.h"
 
 namespace Msp {
 namespace GL {
 
 /**
-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.
+Two-dimensional texture, consisting of a rectangular array of texels.
 */
-class Texture2D: public Texture
+class Texture2D: public Texture2DBackend
 {
+	friend Texture2DBackend;
+
 public:
 	class Loader: public Msp::DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>
 	{
@@ -25,74 +24,40 @@ public:
 	private:
 		void init();
 
-		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned);
 		void storage_levels(PixelFormat, unsigned, unsigned, unsigned);
 	};
 
 private:
-	class AsyncLoader;
-
-	unsigned width;
-	unsigned height;
-	unsigned levels;
-	unsigned allocated;
+	unsigned width = 0;
+	unsigned height = 0;
+	unsigned levels = 0;
 
 public:
-	Texture2D(ResourceManager * = 0);
+	Texture2D() = default;
+	Texture2D(Texture2D &&) = default;
 	virtual ~Texture2D();
 
-	/** Defines storage structure for the texture.  If lv is zero, the number
-	of mipmap levels is automatically determined from storage dimensions.
-
-	Must be called before an image can be uploaded.  Once storage is defined,
-	it can't be changed. */
-	void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv = 0);
-
-	DEPRECATED void storage(PixelComponents cm, unsigned wd, unsigned ht, unsigned lv = 0)
-	{ storage(make_pixelformat(cm, UNSIGNED_BYTE), wd, ht, lv); }
-
-	/** Allocates storage for the texture.  The contents are initially
-	undefined.  If storage has already been allocated, does nothing. */
-	void allocate(unsigned level);
-
-	/** Updates the contents of the entire texture.  Storage must be defined
-	beforehand.  The image data must have dimensions and format matching the
-	defined storage. */
-	virtual void image(unsigned level, const void *data);
-
-	DEPRECATED void image(unsigned level, PixelComponents fmt, DataType type, const void *data);
+	/** Sets storage format and dimensions and allocates memory for the texture.
+	If lv is zero, a complete mipmap pyramid is automatically created.  Storage
+	cannot be changed once set. */
+	void storage(PixelFormat, unsigned wd, unsigned ht, unsigned lv = 0);
 
-	/** Updates a rectangular region of the texture.  Storage must be defined
-	beforehand.  The image data must be in a format mathing the defined storage
-	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);
+	void image(unsigned level, const void *) override;
 
-	DEPRECATED void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
-		PixelComponents fmt, DataType type, const void *data);
+	/** Replaces a rectangular region of the texture.  Allocated storage must
+	exist.  The image data is interpreted according to the storage format and
+	the region must be fully inside the selected mipmap level. */
+	void sub_image(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht, const void *);
 
-	/** 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);
+	virtual void image(const Graphics::Image &, unsigned = 0);
 
-	using Texture::image;
-
-private:
-	void image(const Graphics::Image &, unsigned, bool);
-
-public:
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
 
 private:
 	unsigned get_n_levels() const;
 	LinAl::Vector<unsigned, 2> get_level_size(unsigned) const;
-
-public:
-	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-	virtual UInt64 get_data_size() const;
-	virtual void unload();
 };
 
 } // namespace GL