X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexture1d.h;h=b14ff917666f88cb02fc7fbbcd5c55a8330b0075;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=52a768759eba68cd26149d61b12c1060161b5460;hpb=aead6d04308d7873dc99aa4572ce1590a89ebcbd;p=libs%2Fgl.git diff --git a/source/texture1d.h b/source/texture1d.h index 52a76875..b14ff917 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,16 @@ 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 &, unsigned, 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 = 0); using Texture::image; unsigned get_width() const { return width; }