From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 8 Jul 2019 16:24:02 +0000 (+0300)
Subject: Make explicit mipmap generation public
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=85c6c43eb0f937f31f4a91ef3731d8bb2e98c8b4;p=libs%2Fgl.git

Make explicit mipmap generation public

Also changed set_generate_mipmap to set_auto_generate_mipmap to clarify
that it concerns automatic mipmap generation.
---

diff --git a/source/resources.cpp b/source/resources.cpp
index 03e10e2d..22814cb8 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -121,7 +121,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 
 		if(is_mipmapped(default_tex_filter))
 		{
-			tex->set_generate_mipmap(true);
+			tex->set_auto_generate_mipmap(true);
 			tex->set_mag_filter(LINEAR);
 		}
 		else
diff --git a/source/texture.cpp b/source/texture.cpp
index 9d76e062..f1689145 100644
--- a/source/texture.cpp
+++ b/source/texture.cpp
@@ -7,6 +7,7 @@
 #include <msp/gl/extensions/sgis_generate_mipmap.h>
 #include <msp/io/memory.h>
 #include <msp/strings/format.h>
+#include "bindable.h"
 #include "error.h"
 #include "resourcemanager.h"
 #include "resources.h"
@@ -68,7 +69,7 @@ Texture::Texture(GLenum t, ResourceManager *m):
 	wrap_s(REPEAT),
 	wrap_t(REPEAT),
 	wrap_r(REPEAT),
-	gen_mipmap(false),
+	auto_gen_mipmap(0),
 	compare(false),
 	cmp_func(LEQUAL),
 	dirty_params(0)
@@ -157,7 +158,7 @@ void Texture::update_parameter(int mask) const
 	if(mask&WRAP_R)
 		set_parameter_i(GL_TEXTURE_WRAP_R, wrap_r);
 	if(mask&GENERATE_MIPMAP)
-		set_parameter_i(GL_GENERATE_MIPMAP, gen_mipmap);
+		set_parameter_i(GL_GENERATE_MIPMAP, auto_gen_mipmap!=0);
 	if(mask&COMPARE)
 		set_parameter_i(GL_TEXTURE_COMPARE_MODE, (compare ? GL_COMPARE_R_TO_TEXTURE : GL_NONE));
 	if(mask&COMPARE_FUNC)
@@ -266,24 +267,31 @@ bool Texture::can_generate_mipmap()
 	return (EXT_framebuffer_object || SGIS_generate_mipmap);
 }
 
-void Texture::set_generate_mipmap(bool gm)
+void Texture::generate_mipmap()
 {
-	if(gm && !EXT_framebuffer_object)
-		static Require _req(SGIS_generate_mipmap);
-	gen_mipmap = gm;
-	if(!EXT_framebuffer_object)
-		update_parameter(GENERATE_MIPMAP);
+	// glGenerateMipmap is defined here
+	static Require _req(EXT_framebuffer_object);
+
+	if(ARB_direct_state_access)
+		glGenerateTextureMipmap(id);
+	else
+	{
+		BindRestore _bind(this);
+		glGenerateMipmap(target);
+	}
 }
 
-void Texture::auto_generate_mipmap()
+void Texture::set_auto_generate_mipmap(bool gm)
 {
-	// glGenerateMipmap is defined here
 	if(EXT_framebuffer_object)
+		auto_gen_mipmap = gm;
+	else
 	{
-		if(ARB_direct_state_access)
-			glGenerateTextureMipmap(id);
-		else
-			glGenerateMipmap(target);
+		if(gm)
+			static Require _req(SGIS_generate_mipmap);
+
+		auto_gen_mipmap = gm*2;
+		update_parameter(GENERATE_MIPMAP);
 	}
 }
 
@@ -437,7 +445,7 @@ void Texture::Loader::filter(TextureFilter f)
 
 void Texture::Loader::generate_mipmap(bool gm)
 {
-	obj.set_generate_mipmap(gm);
+	obj.set_auto_generate_mipmap(gm);
 }
 
 void Texture::Loader::image_data(const string &data)
diff --git a/source/texture.h b/source/texture.h
index 94614c45..19da0069 100644
--- a/source/texture.h
+++ b/source/texture.h
@@ -128,7 +128,7 @@ protected:
 	TextureWrap wrap_s;
 	TextureWrap wrap_t;
 	TextureWrap wrap_r;
-	bool gen_mipmap;
+	Msp::UInt8 auto_gen_mipmap;
 	bool compare;
 	Predicate cmp_func;
 	mutable int dirty_params;
@@ -170,14 +170,15 @@ public:
 
 	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_generate_mipmap(bool);
+	void set_auto_generate_mipmap(bool);
 
-protected:
-	void auto_generate_mipmap();
+	/// Deprecated.  Use set_auto_generate_mipmap instead.
+	void set_generate_mipmap(bool g) { set_auto_generate_mipmap(g); }
 
-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
diff --git a/source/texture1d.cpp b/source/texture1d.cpp
index e746409b..39782efd 100644
--- a/source/texture1d.cpp
+++ b/source/texture1d.cpp
@@ -74,9 +74,9 @@ void Texture1D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	glTexImage1D(target, level, ifmt, w, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap==1 && level==0)
 	{
-		auto_generate_mipmap();
+		generate_mipmap();
 		allocated |= (1<<get_n_levels())-1;
 	}
 }
@@ -95,8 +95,8 @@ void Texture1D::sub_image(unsigned level, int x, unsigned wd, PixelFormat fmt, D
 	else
 		glTexSubImage1D(target, level, x, wd, fmt, type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap==1 && level==0)
+		generate_mipmap();
 }
 
 void Texture1D::image(const Graphics::Image &img, bool srgb)
diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 806e4a17..94224147 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -104,9 +104,9 @@ void Texture2D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	glTexImage2D(target, level, ifmt, w, h, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap==1 && level==0)
 	{
-		auto_generate_mipmap();
+		generate_mipmap();
 		allocated |= (1<<get_n_levels())-1;
 	}
 }
@@ -125,8 +125,8 @@ void Texture2D::sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht
 	else
 		glTexSubImage2D(target, level, x, y, wd, ht, fmt, type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap==1 && level==0)
+		generate_mipmap();
 }
 
 void Texture2D::image(const Graphics::Image &img, bool srgb)
diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 7c4b0446..5b33c3c6 100644
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -93,9 +93,9 @@ void Texture3D::image(unsigned level, PixelFormat fmt, DataType type, const void
 	glTexImage3D(target, level, ifmt, width, height, depth, 0, get_upload_format(fmt), type, data);
 
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap==1 && level==0)
 	{
-		auto_generate_mipmap();
+		generate_mipmap();
 		allocated |= (1<<get_n_levels())-1;
 	}
 }
@@ -114,8 +114,8 @@ void Texture3D::sub_image(unsigned level, int x, int y, int z, unsigned wd, unsi
 	else
 		glTexSubImage3D(target, level, x, y, z, wd, ht, dp, fmt, type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap==1 && level==0)
+		generate_mipmap();
 }
 
 void Texture3D::load_image(const string &fn, int dp)
diff --git a/source/texturecube.cpp b/source/texturecube.cpp
index 83063241..cd18c10d 100644
--- a/source/texturecube.cpp
+++ b/source/texturecube.cpp
@@ -106,10 +106,10 @@ void TextureCube::image(TextureCubeFace face, unsigned level, PixelFormat fmt, D
 
 	// XXX Allocation should be tracked per-face, but we'll run out of bits
 	allocated |= 1<<level;
-	if(gen_mipmap && level==0)
+	if(auto_gen_mipmap==1 && level==0)
 	{
 		// TODO Only do this once all faces are created
-		auto_generate_mipmap();
+		generate_mipmap();
 		allocated |= (1<<get_n_levels())-1;
 	}
 }
@@ -124,8 +124,8 @@ void TextureCube::sub_image(TextureCubeFace face, unsigned level, int x, int y,
 
 	glTexSubImage2D(face, level, x, y, wd, ht, get_upload_format(fmt), type, data);
 
-	if(gen_mipmap && level==0)
-		auto_generate_mipmap();
+	if(auto_gen_mipmap==1 && level==0)
+		generate_mipmap();
 }
 
 void TextureCube::image(TextureCubeFace face, const Graphics::Image &img, bool srgb)