Require texture data to be uploaded in a format matching the storage

[libs/gl.git] / source / texture3d.h

diff --git a/source/texture3d.h b/source/texture3d.h
index ecdff9d6c90549ae7e958e815e67e8493a4b050c..d67d03be62a1c413dd913e73e3092d1b682f7f29 100644 (file)
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -53,22 +53,26 @@ public:
        undefined.  If storage has already been allocated, does nothing. */
        void allocate(unsigned level);
 
-       /** Uploads an image to the texture.  Storage must be defined beforehand.
-       The image data must have dimensions and format compatible with the defined
-       storage. */
-       void image(unsigned level, PixelComponents, DataType type, const void *data);
+       /** Updates the contents of the entire texture.  Storage must be defined
+       beforehand.  The image data must have dimensions and format matching the
+       defined storage. */
+       void image(unsigned level, const void *data);
+
+       DEPRECATED void image(unsigned level, PixelComponents comp, DataType type, const void *data);
 
        /** Updates a cuboid-shaped region of the texture.  Storage must be defined
-       and allocated beforehand.  The update region must be fully inside the
-       texture. */
-       void sub_image(unsigned level,
+       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, int z, unsigned wd, unsigned ht, unsigned dp, const void *data);
+
+       DEPRECATED void sub_image(unsigned level,
                int x, int y, int z, unsigned wd, unsigned ht, unsigned dp,
                PixelComponents comp, DataType type, const void *data);
 
-       /** 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.
+       /** 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.
 
        If srgb is true and storage is determined by this call, then an sRGB pixel
        format will be used. */