Remove the deprecated ProgramBuilder class

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

diff --git a/source/texturecube.h b/source/texturecube.h
index f5a364047874aa10569e2fe1a4c727e69b47063b..ae305153fec6860a8f37e3128f037214f07d5e25 100644 (file)
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -46,11 +46,14 @@ public:
                void image_data(TextureCubeFace, const std::string &);
                void raw_data(TextureCubeFace, const std::string &);
                void storage(PixelFormat, unsigned);
+               void storage_levels(PixelFormat, unsigned, unsigned);
        };
 
 private:
        unsigned size;
        unsigned levels;
+       /* Lowest six bits track allocation status of faces on the base level.  Bit
+       seven is set if the entire base level is allocated. */
        unsigned allocated;
 
        static TextureCubeFace face_order[6];
@@ -67,26 +70,35 @@ public:
        it can't be changed. */
        void storage(PixelFormat fmt, unsigned size, unsigned lv = 0);
 
+       DEPRECATED void storage(PixelComponents c, unsigned s, unsigned l = 0)
+       { storage(make_pixelformat(c, UNSIGNED_BYTE), s, l); }
+
        /** Allocates storage for the cube faces.  The contents are initially
        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,
-               PixelFormat fmt, DataType type, const void *data);
+       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,
-               PixelFormat fmt, DataType type, const void *data);
+               PixelComponents comp, DataType type, const void *data);
+
+       void image(TextureCubeFace, const Graphics::Image &);
 
-       void image(TextureCubeFace, const Graphics::Image &, bool = false);
+       DEPRECATED void image(TextureCubeFace, const Graphics::Image &, bool);
 
-       virtual void image(const Graphics::Image &, unsigned, bool = false);
+       virtual void image(const Graphics::Image &, unsigned = 0);
        using Texture::image;
 
        unsigned get_size() const { return size; }