X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexturecube.h;h=8235620025aed86d0bc050733904590c0137a186;hb=2ba5af95fb7341b0e6b212e28d03208c6747aae5;hp=f716098329cf09fc1a3a663c2de34501c5f25f16;hpb=9087cc0a372b9c739f15398c7a22c0a6eb5041bb;p=libs%2Fgl.git diff --git a/source/texturecube.h b/source/texturecube.h index f7160983..82356200 100644 --- a/source/texturecube.h +++ b/source/texturecube.h @@ -77,16 +77,20 @@ public: undefined. If storage has already been allocated, does nothing. */ void allocate(unsigned level); - /** Uploads image data to a face. Storage must be defined beforehand. The - image data must have dimensions and format compatible with the defined + /** Updates the contents of a face. Storage must be defined beforehand. + The image data must have dimensions and format matching the defined storage. */ - void image(TextureCubeFace face, unsigned level, + void image(TextureCubeFace face, unsigned level, const void *data); + + DEPRECATED void image(TextureCubeFace face, unsigned level, PixelComponents comp, DataType type, const void *data); - /** Updates a rectangular region of a face. Storage must be defined and - allocated beforehand. The update region must be fully inside the texture. - The data format must be compatible with the defined storage. */ - void sub_image(TextureCubeFace face, unsigned level, + /** Updates a rectangular region of a face. 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 face. */ + void sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned w, unsigned h, const void *data); + + DEPRECATED void sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned w, unsigned h, PixelComponents comp, DataType type, const void *data);