X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.h;h=61a3f29f035c99b31dc5fc48cceff853ec3fbab8;hp=209cede5843535a40b888c872f6be88909fd8436;hb=959efbf61663efd7879070ce0447e02c8a447ce0;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 209cede5..61a3f29f 100644
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -9,9 +9,7 @@ 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 Texture2DBackend
 {
@@ -26,7 +24,6 @@ public:
 	private:
 		void init();
 
-		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned);
 		void storage_levels(PixelFormat, unsigned, unsigned, unsigned);
 	};
@@ -39,29 +36,19 @@ private:
 public:
 	virtual ~Texture2D();
 
-	/** Defines storage structure for the texture.  If lv is zero, the number
-	of mipmap levels is automatically determined from storage dimensions.
+	/** 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);
 
-	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);
+	void image(unsigned level, const void *) override;
 
-	/** 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);
+	/** 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 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);
-
-	/** 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;
+	virtual void image(const Graphics::Image &, unsigned = 0);
 
 	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
@@ -72,7 +59,7 @@ private:
 
 public:
 	virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-	virtual std::uint64_t get_data_size() const;
+	virtual std::size_t get_data_size() const;
 	using Texture2DBackend::unload;
 };