- PixelFormat fmt, DataType type, const void *data);
-
- /** Loads an image from a file and uploads it to the texture. If storage
- has not been defined, it will be set to match the loaded image. To
- construct a three-dimensional texture from a two-dimensional image, the
- image is interpreted as an array of consecutive images. If dp is -1, the
- texture's width and height are equal. If dp is -2, the texture's height and
- depth are equal. Otherwise, dp must be positive and determines the
- texture's depth. In all cases, the image's height must equal the texture's
- height times its depth.
-
- Deprecated in favor of the base class version.*/
- void load_image(const std::string &fn, int dp = -1);
-
- using Texture::load_image;
-
- /** Uploads an image to the texture. If storage has not been defined, it
- will be set to match the image. In this case the image will be treated as
- a stack of square layers and its height must be divisible by its width.
- Otherwise the image must be compatible with the defined storage.
-
- If srgb is true and storage is determined by this call, then an sRGB pixel
- format will be used. */
- virtual void image(const Graphics::Image &, bool = false);
+ PixelComponents comp, 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. In this case the
+ image will be treated as a stack of square layers and its height must be
+ divisible by its width. Otherwise the image must match the defined
+ storage. */
+ virtual void image(const Graphics::Image &, unsigned = 0);
+
+ using Texture::image;