Support loading uniform arrays from data files

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

diff --git a/source/texture2d.h b/source/texture2d.h
index eba3286fee15fddce63b67e503f551990b0bf65d..030fe408ad0a2b08bcdc448fe1f305703c3d8dce 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -3,8 +3,6 @@
 
 #include <string>
 #include <msp/graphics/image.h>
-#include "datatype.h"
-#include "pixelformat.h"
 #include "resource.h"
 #include "texture.h"
 
@@ -43,6 +41,7 @@ private:
 
 public:
        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. */
@@ -85,7 +84,7 @@ private:
        void get_level_size(unsigned, unsigned &, unsigned &);
 
 public:
-       virtual Resource::AsyncLoader *load(IO::Seekable &);
+       virtual Resource::AsyncLoader *load(IO::Seekable &, const Resources * = 0);
        virtual UInt64 get_data_size() const;
        virtual void unload();
 };