X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.h;h=2b2a6b19cceec1236ee2d416d99bf08762328887;hb=42293e1bd6f3d6297a1d0207ca69e7864a7d76e8;hp=ee930a8721a80205507deed18c73536a7584efe4;hpb=d2efbd8a32efa2a3ee8542efc846277af19d63e0;p=libs%2Fgl.git

diff --git a/source/texture1d.h b/source/texture1d.h
index ee930a87..2b2a6b19 100644
--- a/source/texture1d.h
+++ b/source/texture1d.h
@@ -19,24 +19,34 @@ public:
 
 		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned);
+		void storage_levels(PixelFormat, unsigned, unsigned);
 	};
 
 private:
-	PixelFormat ifmt;
 	unsigned width;
+	unsigned levels;
 	unsigned allocated;
 
 public:
 	Texture1D();
 
-	void storage(PixelFormat, unsigned);
+	void storage(PixelFormat, unsigned, unsigned = 0);
+
+	DEPRECATED void storage(PixelComponents c, unsigned w, unsigned l = 0)
+	{ storage(make_pixelformat(c, UNSIGNED_BYTE), w, l); }
+
 	void allocate(unsigned);
-	void image(unsigned, PixelFormat, DataType, const void *);
-	virtual void image(const Graphics::Image &, bool = false);
+	void image(unsigned, const void *);
+	DEPRECATED void image(unsigned, PixelComponents, DataType, const void *);
+	void sub_image(unsigned, int, unsigned, const void *);
+	DEPRECATED void sub_image(unsigned, int, unsigned, PixelComponents, DataType, const void *);
+	virtual void image(const Graphics::Image &, unsigned, bool = false);
+	using Texture::image;
 	unsigned get_width() const { return width; }
 
 private:
-	unsigned get_level_size(unsigned);
+	unsigned get_n_levels() const;
+	unsigned get_level_size(unsigned) const;
 
 public:
 	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }