Mipmap generation requires GL_SGIS_generate_mipmap

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

diff --git a/source/texture.h b/source/texture.h
index 35f70ad693e51f7e567639dd89ae28ce5b4bd160..580517257e5ffc844808aea112d465929a5d2519 100644 (file)
--- a/source/texture.h
+++ b/source/texture.h
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_TEXTURE_H_
 #define MSP_GL_TEXTURE_H_
 
-#include <istream>
 #include <msp/datafile/objectloader.h>
 #include "gl.h"
 #include "predicate.h"
@@ -26,14 +18,11 @@ enum TextureFilter
        LINEAR_MIPMAP_LINEAR   = GL_LINEAR_MIPMAP_LINEAR
 };
 
-std::istream &operator>>(std::istream &, TextureFilter &);
-
 
 enum TextureWrap
 {
        REPEAT          = GL_REPEAT,
        CLAMP_TO_EDGE   = GL_CLAMP_TO_EDGE,
-       CLAMP_TO_BORDER = GL_CLAMP_TO_BORDER,
        MIRRORED_REPEAT = GL_MIRRORED_REPEAT
 };
 
@@ -50,9 +39,13 @@ protected:
        {
        public:
                Loader(Texture &);
-               void min_filter(TextureFilter);
-               void mag_filter(TextureFilter);
                void generate_mipmap(bool);
+               void mag_filter(TextureFilter);
+               void min_filter(TextureFilter);
+               void wrap(TextureWrap);
+               void wrap_r(TextureWrap);
+               void wrap_s(TextureWrap);
+               void wrap_t(TextureWrap);
        };
 
        enum ParameterMask