Clean up includes and forward declarations for the core classes

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

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 8f5c9b21df7df778559e2f52e40bf10bd841144a..0ef4fc1fbefde4ed730cb41e2e1cd631bf4b8d24 100644 (file)
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -2,13 +2,14 @@
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
-#include <msp/graphics/image.h>
 #include <msp/linal/vector.h>
 #include "texture.h"
 
 namespace Msp {
 namespace GL {
 
+class Buffer;
+
 /**
 Two-dimensional texture.  Consists of an array of texels in the shape of a
 rectangle.  Texture coordinate have a range of [0, 1].  Coordinates outside of
@@ -36,7 +37,6 @@ private:
        unsigned width;
        unsigned height;
        unsigned levels;
-       unsigned allocated;
 
 public:
        Texture2D(ResourceManager * = 0);
@@ -49,36 +49,20 @@ public:
        it can't be changed. */
        void storage(PixelFormat fmt, unsigned wd, unsigned ht, unsigned lv = 0);
 
-       DEPRECATED void storage(PixelComponents cm, unsigned wd, unsigned ht, unsigned lv = 0)
-       { storage(make_pixelformat(cm, UNSIGNED_BYTE), wd, ht, lv); }
-
-       /** Allocates storage for the texture.  The contents are initially
-       undefined.  If storage has already been allocated, does nothing. */
-       void allocate(unsigned level);
-
-private:
-       void allocate_(unsigned level);
-
-public:
        /** Updates the contents of the entire texture.  Storage must be defined
        beforehand.  The image data must have dimensions and format matching the
        defined storage. */
        virtual void image(unsigned level, const void *data);
 
-private:
-       void image_(unsigned level, const void *data);
-
-public:
-       DEPRECATED void image(unsigned level, PixelComponents fmt, DataType type, const void *data);
-
        /** Updates a rectangular 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, unsigned wd, unsigned ht, const void *data);
 
-       DEPRECATED void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
-               PixelComponents fmt, DataType type, const void *data);
+private:
+       void sub_image(unsigned, int, int, unsigned, unsigned, const Buffer &, unsigned);
 
+public:
        /** Updates the contents of the entire texture from an image.  If storage
        has not been defined, it will be set to match the image.  Otherwise the
        image must match the defined storage. */
@@ -86,10 +70,6 @@ public:
 
        using Texture::image;
 
-private:
-       void image(const Graphics::Image &, unsigned, bool);
-
-public:
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
 
@@ -99,7 +79,7 @@ private:
 
 public:
        virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
-       virtual UInt64 get_data_size() const;
+       virtual std::uint64_t get_data_size() const;
        virtual void unload();
 };