Remove the obsolete storage statement with border

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

diff --git a/source/texture2d.h b/source/texture2d.h
index 639d47a6cee591d3a39ad6cbeced110c75550a0a..92dafc7142e31b980493cc20013725f73d29f3c3 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,8 +3,7 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
+#include "resource.h"
 #include "texture.h"
 
 namespace Msp {
@@ -26,20 +25,21 @@ public:
        private:
                void init();
 
-               void image_data(const std::string &);
                void raw_data(const std::string &);
                void storage(PixelFormat, unsigned, unsigned);
-               void storage_b(PixelFormat, unsigned, unsigned, unsigned);
        };
 
 private:
+       class AsyncLoader;
+
        PixelFormat ifmt;
        unsigned width;
        unsigned height;
        unsigned allocated;
 
 public:
-       Texture2D();
+       Texture2D(ResourceManager * = 0);
+       virtual ~Texture2D();
 
        /** Defines storage structure for the texture.  Must be called before an
        image can be uploaded.  Once storage is defined, it can't be changed. */
@@ -60,22 +60,28 @@ public:
        void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
                PixelFormat fmt, DataType type, const void *data);
 
-       /// Loads a Graphics::Image from a file and uploads it to the texture.
-       void load_image(const std::string &fn, bool srgb = false);
-
        /** Uploads an image to the texture.  If storage has not been defined, it
        will be set to match the image.  Otherwise the image must be compatible with
        the defined storage.
 
        If srgb is true and storage is determined by this call, then an sRGB pixel
        format will be used. */
-       void image(const Graphics::Image &, bool srgb = false);
+       virtual void image(const Graphics::Image &, bool srgb = false);
+
+private:
+       void image(const Graphics::Image &, bool, bool);
 
+public:
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
 
 private:
        void get_level_size(unsigned, unsigned &, unsigned &);
+
+public:
+       virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
+       virtual UInt64 get_data_size() const;
+       virtual void unload();
 };
 
 } // namespace GL