Remove the separate allocation step from textures and buffers

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

diff --git a/source/core/texture3d.h b/source/core/texture3d.h
index 1f50e056d8cb286d8e99b4c739f83e5f09c777bd..7b88db50d36f6afed388d2cae9dd61685a5204ac 100644 (file)
--- a/source/core/texture3d.h
+++ b/source/core/texture3d.h
@@ -2,6 +2,7 @@
 #define MSP_GL_TEXTURE3D_H_
 
 #include <string>
+#include <msp/linal/vector.h>
 #include "texture.h"
 
 namespace Msp {
@@ -27,14 +28,12 @@ public:
                void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
        };
 
-private:
+protected:
        unsigned width;
        unsigned height;
        unsigned depth;
        unsigned levels;
-       unsigned allocated;
 
-protected:
        Texture3D(GLenum);
 public:
        Texture3D();
@@ -46,29 +45,16 @@ public:
        it can't be changed. */
        void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned dp, unsigned lv = 0);
 
-       DEPRECATED void storage(PixelComponents c, unsigned w, unsigned h, unsigned d, unsigned l = 0)
-       { storage(make_pixelformat(c, UNSIGNED_BYTE), w, h, d, l); }
-
-       /** Allocates storage for the texture.  The contents are initially
-       undefined.  If storage has already been allocated, does nothing. */
-       void allocate(unsigned level);
-
        /** Updates the contents of the entire texture.  Storage must be defined
        beforehand.  The image data must have dimensions and format matching the
        defined storage. */
        void image(unsigned level, const void *data);
 
-       DEPRECATED void image(unsigned level, PixelComponents comp, DataType type, const void *data);
-
        /** Updates a cuboid-shaped region of the texture.  Storage must be defined
        beforehand.  The image data must be in a format mathing the defined storage
        and the update region must be fully inside the texture. */
        void sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, const void *data);
 
-       DEPRECATED void sub_image(unsigned level,
-               int x, int y, int z, unsigned wd, unsigned ht, unsigned dp,
-               PixelComponents comp, DataType type, const void *data);
-
        /** Updates the contents of the entire texture from an image.  If storage
        has not been defined, it will be set to match the image.  In this case the
        image will be treated as a stack of square layers and its height must be
@@ -83,11 +69,11 @@ public:
        unsigned get_depth() const { return depth; }
 protected:
        unsigned get_n_levels() const;
-       void get_level_size(unsigned, unsigned &, unsigned &, unsigned &) const;
+       LinAl::Vector<unsigned, 3> get_level_size(unsigned) const;
 
 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() { }
 };