X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture1d.h;h=b0a9c681e2c4917d05d3a108289d9515a308515b;hb=9087cc0a372b9c739f15398c7a22c0a6eb5041bb;hp=506356c77676d98cea1a01d52d8a8f373a71f024;hpb=03d3984ecd2c4e7c38b6a62b4b7a81bab69f8d40;p=libs%2Fgl.git

diff --git a/source/texture1d.h b/source/texture1d.h
index 506356c7..b0a9c681 100644
--- a/source/texture1d.h
+++ b/source/texture1d.h
@@ -19,6 +19,7 @@ public:
 
 		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned);
+		void storage_levels(PixelFormat, unsigned, unsigned);
 	};
 
 private:
@@ -30,10 +31,15 @@ public:
 	Texture1D();
 
 	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 *);
-	void sub_image(unsigned, int, unsigned, PixelFormat, DataType, const void *);
-	virtual void image(const Graphics::Image &, bool = false);
+	void image(unsigned, PixelComponents, DataType, const void *);
+	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: