From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 16 Sep 2021 22:00:07 +0000 (+0300)
Subject: Remove automatic mipmap generation from the public interface of Texture
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=4e9fe48180c7b4646ac2591e172de61f7a693b32;p=libs%2Fgl.git

Remove automatic mipmap generation from the public interface of Texture

The flag is now only used in conjunction of textures loaded from
datafiles.  Mipmap generation can still be manually triggered.

This causes some lossage with the allocation flags if the texture storage
extension is not supported.  I'll likely refactor the allocation system
soon.
---

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)
diff --git a/source/core/texture.h b/source/core/texture.h
index 1631f69f..04a81085 100644
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -37,6 +37,8 @@ protected:
 	private:
 		void init();
 
+		virtual void finish();
+
 	protected:
 		void load_external_image(Graphics::Image &, const std::string &);
 
@@ -84,17 +86,8 @@ protected:
 public:
 	PixelFormat get_format() const { return format; }
 
-	static bool can_generate_mipmap();
-
 	void generate_mipmap();
 
-	/** Sets automatic mipmap generation.  If enabled, mipmaps are generated
-	when a texture image is uploaded. */
-	void set_auto_generate_mipmap(bool);
-
-	/// Deprecated.  Use set_auto_generate_mipmap instead.
-	DEPRECATED void set_generate_mipmap(bool g) { set_auto_generate_mipmap(g); }
-
 	/// Loads a Graphics::Image from a file and uploads it to the texture.
 	virtual void load_image(const std::string &, unsigned = 0);
 
diff --git a/source/core/texture1d.cpp b/source/core/texture1d.cpp
index 1dbe36eb..03e02159 100644
--- a/source/core/texture1d.cpp
+++ b/source/core/texture1d.cpp
@@ -86,11 +86,6 @@ void Texture1D::image(unsigned level, const void *data)
 	glTexImage1D(target, level, fmt, get_level_size(level), 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
 }
 
 void Texture1D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -118,9 +113,6 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, const void *data)
 		bind_scratch();
 		glTexSubImage1D(target, level, x, wd, comp, type, data);
 	}
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
 }
 
 void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelComponents comp, DataType type, const void *data)
diff --git a/source/core/texture2d.cpp b/source/core/texture2d.cpp
index ed0b206c..0fc300e0 100644
--- a/source/core/texture2d.cpp
+++ b/source/core/texture2d.cpp
@@ -116,11 +116,6 @@ void Texture2D::image(unsigned level, const void *data)
 	glTexImage2D(target, level, fmt, size.x, size.y, 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
 }
 
 void Texture2D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -148,9 +143,6 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 		bind_scratch();
 		glTexSubImage2D(target, level, x, y, wd, ht, comp, type, data);
 	}
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
 }
 
 void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)
@@ -303,6 +295,8 @@ bool Texture2D::AsyncLoader::process()
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, pixel_buffer.get_id());
 		texture.image(image, 0, true);
 		glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
+		if(texture.auto_gen_mipmap)
+			texture.generate_mipmap();
 	}
 
 	++phase;
diff --git a/source/core/texture3d.cpp b/source/core/texture3d.cpp
index 705a40ba..a7dae703 100644
--- a/source/core/texture3d.cpp
+++ b/source/core/texture3d.cpp
@@ -103,11 +103,6 @@ void Texture3D::image(unsigned level, const void *data)
 	glTexImage3D(target, level, fmt, size.x, size.y, size.z, 0, comp, type, data);
 
 	allocated |= 1<<level;
-	if(auto_gen_mipmap && level==0)
-	{
-		generate_mipmap();
-		allocated |= (1<<levels)-1;
-	}
 }
 
 void Texture3D::image(unsigned level, PixelComponents comp, DataType type, const void *data)
@@ -135,9 +130,6 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 		bind_scratch();
 		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, comp, type, data);
 	}
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
 }
 
 void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsigned ht, unsigned dp, PixelComponents comp, DataType type, const void *data)
diff --git a/source/core/texturecube.cpp b/source/core/texturecube.cpp
index a2c6c8eb..6eaa3a44 100644
--- a/source/core/texturecube.cpp
+++ b/source/core/texturecube.cpp
@@ -127,14 +127,7 @@ void TextureCube::image(TextureCubeFace face, unsigned level, const void *data)
 	{
 		allocated |= 1<<get_face_index(face);
 		if((allocated&63)==63)
-		{
 			allocated |= 64;
-			if(auto_gen_mipmap && level==0 && (allocated&63)==63)
-			{
-				generate_mipmap();
-				allocated |= (64<<levels)-1;
-			}
-		}
 	}
 	else if(!(allocated&(64<<level)))
 	{
@@ -171,9 +164,6 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 		bind_scratch();
 		glTexSubImage2D(face, level, x, y, wd, ht, comp, type, data);
 	}
-
-	if(auto_gen_mipmap && level==0)
-		generate_mipmap();
 }
 
 void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y, unsigned wd, unsigned ht, PixelComponents comp, DataType type, const void *data)