Improve allocation handling in cube map textures

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

diff --git a/source/texturecube.h b/source/texturecube.h
index 9ce216fdd1db1e79e164769f9d6017984de15f46..dabf2b8883690228c9e12e9babe232a95326015e 100644 (file)
--- a/source/texturecube.h
+++ b/source/texturecube.h
@@ -49,8 +49,10 @@ public:
        };
 
 private:
-       PixelFormat ifmt;
        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];
@@ -60,9 +62,12 @@ private:
 public:
        TextureCube();
 
-       /** Defines storage structure for the texture.  Must be called before an
-       image can be uploaded.  Once storage is defined, it can't be changed. */
-       void storage(PixelFormat fmt, unsigned size);
+       /** Defines storage structure for the texture.  If lv is zero, the number
+       of mipmap levels is automatically determined from storage dimensions.
+
+       Must be called before an image can be uploaded.  Once storage is defined,
+       it can't be changed. */
+       void storage(PixelFormat fmt, unsigned size, unsigned lv = 0);
 
        /** Allocates storage for the cube faces.  The contents are initially
        undefined.  If storage has already been allocated, does nothing. */
@@ -83,7 +88,8 @@ public:
 
        void image(TextureCubeFace, const Graphics::Image &, bool = false);
 
-       virtual void image(const Graphics::Image &, bool = false);
+       virtual void image(const Graphics::Image &, unsigned, bool = false);
+       using Texture::image;
 
        unsigned get_size() const { return size; }
 private: