-
- /** Uploads an image to the texture. storage() must have been called prior to
- this, and the image must have dimensions conforming to the specified
- storage. For level>0, mipmapping rules apply to the image dimensions. */
- void image(unsigned level, PixelFormat fmt, DataType type, const void *data);
-
- /**
- Uploads a sub-image into the texture. Unlike full image upload, there are
- no constraints on the size of the sub-image.
- */
- void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelFormat fmt, DataType type, const void *data);
-
- /**
- Loads an image from a file and uploads it to the texture. If storage() has
- not been called, the storage format will be set to match the loaded image.
- */
- void load_image(const std::string &fn);
-
- unsigned get_width() const { return width; }
+
+ /** 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);
+
+ /** 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);
+
+ DEPRECATED void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
+ PixelComponents fmt, DataType type, 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;
+
+private:
+ void image(const Graphics::Image &, unsigned, bool);
+
+public:
+ unsigned get_width() const { return width; }