remove texture compression

Author: Bamcane

datasrc/languages

@@ -606,30 +606,6 @@ void CCommandProcessorFragment_OpenGL::Cmd_Texture_Create(const CCommandBuffer::
 	//
 	int Oglformat = TexFormatToOpenGLFormat(pCommand->m_Format);
 	int StoreOglformat = TexFormatToOpenGLFormat(pCommand->m_StoreFormat);
-
-	if(pCommand->m_Flags & CCommandBuffer::TEXFLAG_COMPRESSED)
-	{
-		if(m_IsOpenGLES)
-		{
-			switch(StoreOglformat)
-			{
-				case GL_RGB: StoreOglformat = GL_COMPRESSED_RGB8_ETC2; break;
-				case GL_RED: StoreOglformat = GL_COMPRESSED_R11_EAC; break;
-				case GL_RGBA: StoreOglformat = GL_COMPRESSED_RGBA8_ETC2_EAC; break;
-				default: StoreOglformat = GL_COMPRESSED_RGBA8_ETC2_EAC;
-			}
-		}
-		else
-		{
-			switch(StoreOglformat)
-			{
-				case GL_RGB: StoreOglformat = GL_COMPRESSED_RGB; break;
-				case GL_RED: StoreOglformat = GL_COMPRESSED_RED; break;
-				case GL_RGBA: StoreOglformat = GL_COMPRESSED_RGBA; break;
-				default: StoreOglformat = GL_COMPRESSED_RGBA;
-			}
-		}
-	}
 	m_aTextures[pCommand->m_Slot].m_BasicSamplerType = SAMPLER2D_NOMIPMAPS;
 	// 2D texture
 	bool Mipmaps = !(pCommand->m_Flags & CCommandBuffer::TEXFLAG_NOMIPMAPS);

src/engine/client/backend_sdl.cpp

@@ -354,8 +354,6 @@ IGraphics::CTextureHandle CGraphics_Threaded::LoadTextureRaw(int Width, int Heig
 	Cmd.m_Flags = 0;
 	if(Flags & IGraphics::TEXLOAD_NOMIPMAPS)
 		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_NOMIPMAPS;
-	if(m_pConfig->m_GfxTextureCompression)
-		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_COMPRESSED;
 	if(m_pConfig->m_GfxTextureQuality || Flags & TEXLOAD_NORESAMPLE)
 		Cmd.m_Flags |= CCommandBuffer::TEXFLAG_QUALITY;
 	if(Flags & IGraphics::TEXLOAD_LINEARMIPMAPS)

src/engine/client/graphics_threaded.cpp

@@ -104,9 +104,8 @@ class CCommandBuffer
 		TEXFORMAT_ALPHA,
 
 		TEXFLAG_NOMIPMAPS = 1,
-		TEXFLAG_COMPRESSED = 2,
-		TEXFLAG_QUALITY = 4,
-		TEXFLAG_LINEARMIPMAPS = 8,
+		TEXFLAG_QUALITY = 2,
+		TEXFLAG_LINEARMIPMAPS = 4,
 	};
 
 	enum

src/engine/client/graphics_threaded.h

@@ -58,7 +58,6 @@ MACRO_CONFIG_INT(GfxClear, gfx_clear, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "C
 MACRO_CONFIG_INT(GfxVsync, gfx_vsync, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Vertical sync")
 MACRO_CONFIG_INT(GfxDisplayAllModes, gfx_display_all_modes, 0, 0, 0, CFGFLAG_SAVE | CFGFLAG_CLIENT, "List non-supported display modes")
 MACRO_CONFIG_INT(GfxHighdpi, gfx_highdpi, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Use high dpi mode if available")
-MACRO_CONFIG_INT(GfxTextureCompression, gfx_texture_compression, 0, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Use texture compression")
 MACRO_CONFIG_INT(GfxHighDetail, gfx_high_detail, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "High detail")
 MACRO_CONFIG_INT(GfxTextureQuality, gfx_texture_quality, 1, 0, 1, CFGFLAG_SAVE | CFGFLAG_CLIENT, "Don't scale textures down")
 MACRO_CONFIG_INT(GfxFsaaSamples, gfx_fsaa_samples, 0, 0, 16, CFGFLAG_SAVE | CFGFLAG_CLIENT, "FSAA Samples")

src/engine/shared/config_variables.h

@@ -1602,7 +1602,6 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 	static const int s_GfxFsaaSamples = Config()->m_GfxFsaaSamples;
 	static const int s_GfxOpenGLES = Config()->m_GfxOpenGLES;
 	static const int s_GfxTextureQuality = Config()->m_GfxTextureQuality;
-	static const int s_GfxTextureCompression = Config()->m_GfxTextureCompression;
 
 	CUIRect Label, Button, ScreenLeft, ScreenRight, Texture, BottomView, Background;
 
@@ -1628,7 +1627,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 	ScreenLeft.Draw(vec4(0.0f, 0.0f, 0.0f, 0.25f));
 
 	// render textures menu background
-	NumOptions = 4;
+	NumOptions = 2;
 	BackgroundHeight = (float) (NumOptions + 1) * ButtonHeight + (float) NumOptions * Spacing;
 
 	MainView.HSplitTop(10.0f, 0, &MainView);
@@ -1776,14 +1775,6 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 		m_CheckVideoSettings = true;
 	}
 
-	Texture.HSplitTop(Spacing, 0, &Texture);
-	Texture.HSplitTop(ButtonHeight, &Button, &Texture);
-	if(DoButton_CheckBox(&Config()->m_GfxTextureCompression, Localize("Texture Compression"), Config()->m_GfxTextureCompression, &Button))
-	{
-		Config()->m_GfxTextureCompression ^= 1;
-		m_CheckVideoSettings = true;
-	}
-
 	Texture.HSplitTop(Spacing, 0, &Texture);
 	Texture.HSplitTop(ButtonHeight, &Button, &Texture);
 	if(DoButton_CheckBox(&Config()->m_GfxHighDetail, Localize("High Detail"), Config()->m_GfxHighDetail, &Button))
@@ -1866,7 +1857,6 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView)
 			s_GfxFsaaSamples != Config()->m_GfxFsaaSamples ||
 			s_GfxOpenGLES != Config()->m_GfxOpenGLES ||
 			s_GfxTextureQuality != Config()->m_GfxTextureQuality ||
-			s_GfxTextureCompression != Config()->m_GfxTextureCompression ||
 			(CheckFullscreen && s_GfxFullscreen != Config()->m_GfxFullscreen);
 		m_CheckVideoSettings = false;
 	}
@@ -2064,7 +2054,6 @@ void CMenus::ResetSettingsGraphics()
 	Config()->m_GfxVsync = 1;
 	Config()->m_GfxFsaaSamples = 0;
 	Config()->m_GfxTextureQuality = 1;
-	Config()->m_GfxTextureCompression = 0;
 	Config()->m_GfxHighDetail = 1;
 	Config()->m_GfxOpenGLES = 0;