X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Ftexturecube.h;h=0f83e29e138953e8d2e5c6c7595adb8323ea3a33;hp=39fe0c699b4b6358fa9efe6c7348504450690742;hb=b7ecc29c204faede028556d1942b2d61d5cda9ee;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318

diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index 39fe0c69..0f83e29e 100644
--- a/source/core/texturecube.h
+++ b/source/core/texturecube.h
@@ -52,13 +52,10 @@ 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];
-	static unsigned orientations[12];
+	static const TextureCubeFace face_order[6];
+	static const Vector3 directions[6];
+	static const unsigned orientations[12];
 
 public:
 	TextureCube();
@@ -70,42 +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);
-
-private:
-	void allocate_(unsigned);
-
-public:
 	/** 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);
 
-private:
-	void image_(TextureCubeFace, unsigned, const void *);
-
-public:
-	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;
 
@@ -134,7 +107,7 @@ public:
 	Vector3 get_texel_direction(TextureCubeFace, unsigned, unsigned);
 
 	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-	virtual UInt64 get_data_size() const;
+	virtual std::uint64_t get_data_size() const;
 	virtual void unload() { }
 };