Remove the separate allocation step from textures and buffers

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

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index 09d805e7869f8afd2819596bab336a8db23389a8..241808c1656aa034a4383a61e07897a658453728 100644 (file)
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -25,27 +25,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);
-private:
-       void allocate_(unsigned);
-public:
        void image(unsigned, const void *);
-private:
-       void image_(unsigned, const void *);
-public:
-       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; }
@@ -56,7 +43,7 @@ private:
 
 public:
        virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-       virtual UInt64 get_data_size() const;
+       virtual std::uint64_t get_data_size() const;
        virtual void unload() { }
 };