X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Ftexture.h;h=c091c884cacfd592833120b785c7f83ff2fe303e;hb=89dc716abe7fa671e1da1c033d955cd72da73f33;hp=af0844c55e26938f00b2201e2f10abd576ece537;hpb=8d6ed0b5fb02e2a2f9142e869fd705c36f57a225;p=libs%2Fgl.git

diff --git a/source/texture.h b/source/texture.h
index af0844c5..c091c884 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -71,6 +71,7 @@ protected:
 	public:
 		Loader(Texture &);
 	private:
+		void filter(TextureFilter);
 		void generate_mipmap(bool);
 		void mag_filter(TextureFilter);
 		void max_anisotropy(float);
@@ -118,6 +119,11 @@ protected:
 public:
 	void set_min_filter(TextureFilter);
 	void set_mag_filter(TextureFilter);
+
+	/** Sets filter for both minification and magnification.  Since mipmapping
+	is not applicable to magnification, LINEAR is used instead. */
+	void set_filter(TextureFilter);
+
 	void set_max_anisotropy(float);
 
 	/** Sets the wrapping mode for all coordinates. */
@@ -143,11 +149,11 @@ public:
 	GLenum get_target() const { return target; }
 	unsigned get_id() const { return id; }
 
-	void bind() const;
+	void bind() const { bind_to(0); }
 	void bind_to(unsigned) const;
 
-	static const Texture *current();
-	static void unbind();
+	static const Texture *current(unsigned = 0);
+	static void unbind() { unbind_from(0); }
 	static void unbind_from(unsigned);
 };