paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Removes unused GL texture properties after removed FFP.

Browse Source 
This was SVN commit r24577.
This commit is contained in:
Vladislav Belov 2021-01-12 23:18:29 +00:00
parent f1a3b446f7
commit e5cbd3decd
4 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/gui/GUIRenderer.cpp
View File

@ -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
}

9
source/renderer/Renderer.cpp
View File

@ -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();

2
source/renderer/TerrainRenderer.cpp
View File

@ -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

2
source/renderer/TerrainRenderer.h
View File

@ -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