From 2c1a42ae55d74ce44629a5eb166ecb5e2d9e1c81 Mon Sep 17 00:00:00 2001
From: Lucy Phipps <landfillbaby@outlook.com>
Date: Sun, 5 Apr 2020 12:42:06 +0100
Subject: [PATCH] remove gl_texture_usehires since it's unused now
 GLTEXMNU_ENABLEHIRES in language.csv is unused too

---
 src/rendering/gl/system/gl_framebuffer.cpp        | 1 -
 src/rendering/hwrenderer/textures/hw_material.cpp | 2 --
 src/rendering/hwrenderer/utility/hw_cvars.cpp     | 5 -----
 src/rendering/hwrenderer/utility/hw_cvars.h       | 1 -
 src/rendering/swrenderer/textures/r_swtexture.cpp | 2 --
 wadsrc/static/menudef.txt                         | 1 -
 6 files changed, 12 deletions(-)

diff --git a/src/rendering/gl/system/gl_framebuffer.cpp b/src/rendering/gl/system/gl_framebuffer.cpp
index 3bcf04bfd..a69172c63 100644
--- a/src/rendering/gl/system/gl_framebuffer.cpp
+++ b/src/rendering/gl/system/gl_framebuffer.cpp
@@ -52,7 +52,6 @@
 EXTERN_CVAR (Bool, vid_vsync)
 EXTERN_CVAR(Bool, r_drawvoxels)
 EXTERN_CVAR(Int, gl_tonemap)
-EXTERN_CVAR(Bool, gl_texture_usehires)
 
 void gl_LoadExtensions();
 void gl_PrintStartupLog();
diff --git a/src/rendering/hwrenderer/textures/hw_material.cpp b/src/rendering/hwrenderer/textures/hw_material.cpp
index b07a7be4c..a70d749fd 100644
--- a/src/rendering/hwrenderer/textures/hw_material.cpp
+++ b/src/rendering/hwrenderer/textures/hw_material.cpp
@@ -29,8 +29,6 @@
 #include "hw_ihwtexture.h"
 #include "hw_material.h"
 
-EXTERN_CVAR(Bool, gl_texture_usehires)
-
 //===========================================================================
 // 
 //	Quick'n dirty image rescaling.
diff --git a/src/rendering/hwrenderer/utility/hw_cvars.cpp b/src/rendering/hwrenderer/utility/hw_cvars.cpp
index 6b9b699e4..18adec826 100644
--- a/src/rendering/hwrenderer/utility/hw_cvars.cpp
+++ b/src/rendering/hwrenderer/utility/hw_cvars.cpp
@@ -80,11 +80,6 @@ CUSTOM_CVAR(Int, gl_texture_filter, 4, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINI
 	screen->TextureFilterChanged();
 }
 
-CUSTOM_CVAR(Bool, gl_texture_usehires, true, CVAR_ARCHIVE|CVAR_NOINITCALL)
-{
-	TexMan.FlushAll();
-}
-
 CVAR(Bool, gl_precache, false, CVAR_ARCHIVE)
 
 //==========================================================================
diff --git a/src/rendering/hwrenderer/utility/hw_cvars.h b/src/rendering/hwrenderer/utility/hw_cvars.h
index 6a2d3cc70..8d184206d 100644
--- a/src/rendering/hwrenderer/utility/hw_cvars.h
+++ b/src/rendering/hwrenderer/utility/hw_cvars.h
@@ -10,7 +10,6 @@ EXTERN_CVAR(Bool, gl_texture)
 EXTERN_CVAR(Int, gl_texture_filter)
 EXTERN_CVAR(Float, gl_texture_filter_anisotropic)
 EXTERN_CVAR(Int, gl_texture_format)
-EXTERN_CVAR(Bool, gl_texture_usehires)
 EXTERN_CVAR(Bool, gl_usefb)
 
 EXTERN_CVAR(Int, gl_weaponlight)
diff --git a/src/rendering/swrenderer/textures/r_swtexture.cpp b/src/rendering/swrenderer/textures/r_swtexture.cpp
index 6b608322c..b5aee3f01 100644
--- a/src/rendering/swrenderer/textures/r_swtexture.cpp
+++ b/src/rendering/swrenderer/textures/r_swtexture.cpp
@@ -39,8 +39,6 @@
 #include "m_alloc.h"
 #include "imagehelpers.h"
 
-EXTERN_CVAR(Bool, gl_texture_usehires)
-
 
 FSoftwareTexture *FTexture::GetSoftwareTexture()
 {
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 89d00ca0f..bc50d9500 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -2534,7 +2534,6 @@ OptionMenu "GLTextureGLOptions" protected
 	Title "$GLTEXMNU_TITLE"
 	Option "$GLTEXMNU_TEXFILTER",		gl_texture_filter,				"FilterModes"
 	Option "$GLTEXMNU_ANISOTROPIC",		gl_texture_filter_anisotropic,	"Anisotropy"
-	Option "$GLTEXMNU_ENABLEHIRES",		gl_texture_usehires,			"YesNo"
 
 	ifOption(MMX)
 	{