X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture.cpp;fp=source%2Fcore%2Ftexture.cpp;h=5c82dbe535d91a3036c4eed0f0f3e4d93a2e2fdb;hb=4e9fe48180c7b4646ac2591e172de61f7a693b32;hp=b40046705b32bdfbecd459b56ce5e9b7c81ae4d9;hpb=7b569bbfcfb65d8d88b47ac42ee1df6a7d27e784;p=libs%2Fgl.git

diff --git a/source/core/texture.cpp b/source/core/texture.cpp
index b4004670..5c82dbe5 100644
--- a/source/core/texture.cpp
+++ b/source/core/texture.cpp
@@ -133,11 +133,6 @@ void Texture::set_parameter_i(GLenum param, int value) const
 		glTexParameteri(target, param, value);
 }
 
-bool Texture::can_generate_mipmap()
-{
-	return EXT_framebuffer_object;
-}
-
 void Texture::generate_mipmap()
 {
 	// glGenerateMipmap is defined here
@@ -152,14 +147,6 @@ void Texture::generate_mipmap()
 	}
 }
 
-void Texture::set_auto_generate_mipmap(bool gm)
-{
-	if(gm)
-		static Require _req(EXT_framebuffer_object);
-
-	auto_gen_mipmap = gm;
-}
-
 void Texture::load_image(const string &fn, bool)
 {
 	load_image(fn, 0U);
@@ -235,6 +222,12 @@ void Texture::Loader::init()
 	add("mipmap_levels", &Loader::mipmap_levels);
 }
 
+void Texture::Loader::finish()
+{
+	if(obj.auto_gen_mipmap)
+		obj.generate_mipmap();
+}
+
 void Texture::Loader::load_external_image(Graphics::Image &img, const string &fn)
 {
 	RefPtr<IO::Seekable> io = get_collection().open_raw(fn);
@@ -269,7 +262,7 @@ void Texture::Loader::external_image_common(const string &fn)
 
 void Texture::Loader::generate_mipmap(bool gm)
 {
-	obj.set_auto_generate_mipmap(gm);
+	obj.auto_gen_mipmap = gm;
 }
 
 void Texture::Loader::image_data(const string &data)