Cosmetic tweaks

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

diff --git a/source/texture2d.h b/source/texture2d.h
index 71e04b576f2b62aa8a93d4c154a3258a596f2bc1..221fbd7b76a28aee38d95382a2b797e34fd5d24c 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,9 +3,6 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
-#include "resource.h"
 #include "texture.h"
 
 namespace Msp {
@@ -27,10 +24,8 @@ 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:
@@ -64,16 +59,13 @@ 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);