Add a convenience method to get the aspect ratio of View

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

diff --git a/source/texture.h b/source/texture.h
index 477eaca382fa55dbe6ab1925fb62677db1ed72c1..4cd5481e2e18f570377c3f13d86b8b4dbf984cb8 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -2,14 +2,15 @@
 #define MSP_GL_TEXTURE_H_
 
 #include <msp/datafile/objectloader.h>
+#include "datatype.h"
 #include "gl.h"
+#include "pixelformat.h"
 #include "predicate.h"
+#include "resource.h"
 
 namespace Msp {
 namespace GL {
 
-class Resources;
-
 enum TextureFilter
 {
        /// No filtering
@@ -65,7 +66,7 @@ texture to be usable.
 If texture coordinates fall outside of the principal range of the texture,
 wrapping is applied.  The default for all directions is REPEAT.
 */
-class Texture
+class Texture: public Resource
 {
 protected:
        class Loader: public DataFile::CollectionObjectLoader<Texture>
@@ -116,13 +117,15 @@ protected:
        Predicate cmp_func;
        mutable int dirty_params;
 
-       Texture(GLenum);
+       Texture(GLenum, ResourceManager * = 0);
        Texture(const Texture &);
        Texture &operator=(const Texture &);
 public:
        ~Texture();
 
 protected:
+       static DataType get_alloc_type(PixelFormat);
+
        void update_parameter(int) const;
 public:
        void set_min_filter(TextureFilter);
@@ -145,6 +148,10 @@ public:
        when a texture image is uploaded. */
        void set_generate_mipmap(bool);
 
+protected:
+       void auto_generate_mipmap();
+
+public:
        /** Sets depth texture comparison.  Has no effect on other formats.  When
        comparison is enabled, the third component of the texture coordinate is
        compared against the texel value, and the result is returned as the texture
@@ -163,6 +170,8 @@ public:
        static const Texture *current(unsigned = 0);
        static void unbind() { unbind_from(0); }
        static void unbind_from(unsigned);
+
+       virtual UInt64 get_data_size() const { return 0; }
 };
 
 } // namespace GL