diff --git a/source/gui/GUIRenderer.cpp b/source/gui/GUIRenderer.cpp index e6cd549758..89e558b697 100644 --- a/source/gui/GUIRenderer.cpp +++ b/source/gui/GUIRenderer.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -341,12 +341,6 @@ void GUIRenderer::Draw(DrawCalls& Calls, float Z) glDisable(GL_BLEND); -#if !CONFIG2_GLES - // Set LOD bias so mipmapped textures are prettier in FFP mode. - if (g_RenderingOptions.GetRenderPath() == RenderPath::FIXED) - glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.f); -#endif - // Iterate through each DrawCall, and execute whatever drawing code is being called for (DrawCalls::const_iterator cit = Calls.begin(); cit != Calls.end(); ++cit) { @@ -445,9 +439,4 @@ void GUIRenderer::Draw(DrawCalls& Calls, float Z) glDisable(GL_BLEND); } - -#if !CONFIG2_GLES - if (g_RenderingOptions.GetRenderPath() == RenderPath::FIXED) - glTexEnvf(GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, 0.f); -#endif } diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp index c466f5cef1..fc1e79b625 100644 --- a/source/renderer/Renderer.cpp +++ b/source/renderer/Renderer.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify @@ -1413,13 +1413,6 @@ void CRenderer::RenderSubmissions(const CBoundingBoxAligned& waterScissor) RenderSilhouettes(context); } -#if !CONFIG2_GLES - // Clean up texture blend mode so particles and other things render OK - // (really this should be cleaned up by whoever set it) - if (g_RenderingOptions.GetRenderPath() == RenderPath::FIXED) - glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); -#endif - // render debug lines if (g_RenderingOptions.GetDisplayFrustum()) DisplayFrustum(); diff --git a/source/renderer/TerrainRenderer.cpp b/source/renderer/TerrainRenderer.cpp index fb43c88bcc..c7a5af5c6c 100644 --- a/source/renderer/TerrainRenderer.cpp +++ b/source/renderer/TerrainRenderer.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify diff --git a/source/renderer/TerrainRenderer.h b/source/renderer/TerrainRenderer.h index a849a6e1ed..24223d8c58 100644 --- a/source/renderer/TerrainRenderer.h +++ b/source/renderer/TerrainRenderer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 Wildfire Games. +/* Copyright (C) 2021 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify