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

Moves anisotropic filtering support check from GL texture to TextureManager to make it explicit.

Browse Source 
This was SVN commit r26919.
This commit is contained in:
Vladislav Belov 2022-06-06 06:59:20 +00:00
parent aaa95dc00b
commit 54aae3e6d4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/graphics/TextureManager.cpp
View File

@ -525,7 +525,7 @@ public:
defaultSamplerDesc.addressModeU = texture->m_Properties.m_AddressModeU;
defaultSamplerDesc.addressModeV = texture->m_Properties.m_AddressModeV;
if (texture->m_Properties.m_AnisotropicFilterEnabled)
if (texture->m_Properties.m_AnisotropicFilterEnabled && m_Device->GetCapabilities().anisotropicFiltering)
{
int maxAnisotropy = 1;
CFG_GET_VAL("textures.maxanisotropy", maxAnisotropy);

4
source/renderer/backend/gl/Texture.cpp
View File

@ -140,9 +140,9 @@ std::unique_ptr<CTexture> CTexture::Create(CDevice* device, const char* name,
glTexParameteri(target, GL_TEXTURE_LOD_BIAS, defaultSamplerDesc.mipLODBias);
#endif // !CONFIG2_GLES
if (type == Type::TEXTURE_2D && defaultSamplerDesc.anisotropyEnabled &&
texture->m_Device->GetCapabilities().anisotropicFiltering)
if (type == Type::TEXTURE_2D && defaultSamplerDesc.anisotropyEnabled)
{
ENSURE(texture->m_Device->GetCapabilities().anisotropicFiltering);
const float maxAnisotropy = std::min(
defaultSamplerDesc.maxAnisotropy, texture->m_Device->GetCapabilities().maxAnisotropy);
glTexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, maxAnisotropy);