Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / texture1d.h

diff --git a/source/texture1d.h b/source/texture1d.h
index ee930a8721a80205507deed18c73536a7584efe4..b14ff917666f88cb02fc7fbbcd5c55a8330b0075 100644 (file)
--- 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 = 0);
+       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; }