Remove the separate allocation step from textures and buffers

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

diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index 15b598174ae3b233b52846e380603f8093e0a3de..b68210b05c98230d892e7dcb780a2331095b3124 100644 (file)
--- a/source/core/texturecube.h
+++ b/source/core/texturecube.h
@@ -52,9 +52,6 @@ public:
 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];
        static Vector3 directions[6];
@@ -70,34 +67,18 @@ 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);
-
        /** 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, 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
        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);
-
        void image(TextureCubeFace, const Graphics::Image &);
 
-       DEPRECATED void image(TextureCubeFace, const Graphics::Image &, bool);
-
        virtual void image(const Graphics::Image &, unsigned = 0);
        using Texture::image;