X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexturecube.h;h=f716098329cf09fc1a3a663c2de34501c5f25f16;hb=9087cc0a372b9c739f15398c7a22c0a6eb5041bb;hp=f5a364047874aa10569e2fe1a4c727e69b47063b;hpb=aead6d04308d7873dc99aa4572ce1590a89ebcbd;p=libs%2Fgl.git

diff --git a/source/texturecube.h b/source/texturecube.h
index f5a36404..f7160983 100644
--- 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,6 +70,9 @@ 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);
@@ -75,14 +81,14 @@ public:
 	image data must have dimensions and format compatible with the defined
 	storage. */
 	void image(TextureCubeFace face, unsigned level,
-		PixelFormat fmt, DataType type, const void *data);
+		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,
 		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 &, bool = false);