Separate abstract pixel compositions from concrete pixel formats

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

diff --git a/source/texture1d.h b/source/texture1d.h
index 52a768759eba68cd26149d61b12c1060161b5460..b0a9c681e2c4917d05d3a108289d9515a308515b 100644 (file)
--- 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,9 +31,13 @@ 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 *);
+       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; }