Disable texture filter/aniso options if r_softemu >= 2

andrei-drexler · Sep 11, 2024 · 36ed75c · 36ed75c
1 parent 03108fa
commit 36ed75c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/Quake/gl_texmgr.c b/Quake/gl_texmgr.c
@@ -324,6 +324,16 @@ static void TexMgr_ForceFilterUpdate (void)
 	gl_texfilter.anisotropy = -1.f;
 }
 
+/*
+===============
+TexMgr_UsesFilterOverride
+===============
+*/
+qboolean TexMgr_UsesFilterOverride (void)
+{
+	return softemu >= SOFTEMU_COARSE || r_softemu_lightmap_banding.value > 0.f;
+}
+
 /*
 ===============
 TexMgr_ApplySettings -- called at the beginning of each frame
@@ -339,7 +349,7 @@ void TexMgr_ApplySettings (void)
 	gl_texfilter.lodbias	= lodbias;
 
 	// if softemu is either 2 & 3 or r_softemu_lightmap_banding is > 0 we override the filtering mode, unless it's GL_NEAREST
-	if (gl_texfilter.mode != 0 && (softemu >= SOFTEMU_COARSE || r_softemu_lightmap_banding.value > 0.f))
+	if (gl_texfilter.mode != 0 && TexMgr_UsesFilterOverride ())
 	{
 		const float SOFTEMU_ANISOTROPY = 8.f;
 		gl_texfilter.mode = 2; // nearest with linear mips

diff --git a/Quake/gl_texmgr.h b/Quake/gl_texmgr.h
@@ -122,6 +122,7 @@ void TexMgr_NewGame (void);
 void TexMgr_Init (void);
 void TexMgr_DeleteTextureObjects (void);
 void TexMgr_ApplySettings (void);
+qboolean TexMgr_UsesFilterOverride (void);
 
 // IMAGE LOADING
 gltexture_t *TexMgr_LoadImage (qmodel_t *owner, const char *name, int width, int height, enum srcformat format,

diff --git a/Quake/menu.c b/Quake/menu.c
@@ -2934,11 +2934,17 @@ VID_Menu_GetTexFilterDesc
 */
 static const char *VID_Menu_GetTexFilterDesc (void)
 {
-	const char *current = Cvar_VariableString ("gl_texturemode");
+	const char *current;
 	int i;
+
+	if (TexMgr_UsesFilterOverride ())
+		return "Classic";
+
+	current = Cvar_VariableString ("gl_texturemode");
 	for (i = 0; i < countof (texfilters); i++)
 		if (!q_strcasecmp (current, texfilters[i][0]))
 			return texfilters[i][1];
+
 	return "";
 }
 
@@ -3490,6 +3496,8 @@ static qboolean M_Options_IsEnabled (int index)
 	index += optionsmenu.first_item;
 	if ((unsigned int) index >= countof (options_names))
 		return false;
+	if (index == OPT_TEXFILTER || index == OPT_ANISO)
+		return !TexMgr_UsesFilterOverride ();
 	if (index > GAMEPAD_OPTIONS_BEGIN && index < GAMEPAD_OPTIONS_END && !IN_HasGamepad ())
 		return false;
 	if (index == GPAD_OPT_RUMBLE && !IN_HasRumble ())