X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.h;h=e77f6484242d1b177a5acff236245fd7ad6988bf;hb=acaefb4c669f01855252818ef0a2958cbdababc3;hp=225cb0de2ec9f32e3f90fb2a74d818b546426090;hpb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;p=libs%2Fgl.git diff --git a/source/core/texture1d.h b/source/core/texture1d.h index 225cb0de..e77f6484 100644 --- a/source/core/texture1d.h +++ b/source/core/texture1d.h @@ -1,6 +1,7 @@ #ifndef MSP_GL_TEXTURE1D_H_ #define MSP_GL_TEXTURE1D_H_ +#include #include "texture.h" namespace Msp { @@ -25,21 +26,14 @@ public: private: unsigned width; unsigned levels; - unsigned allocated; 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, 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; }