ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3271 from Sonicadvance1/es_sampler_cache 

Enable Anisotropic filtering in ES.
This commit is contained in:
Markus Wick 2015-11-19 12:42:16 +01:00
parent 1f4b16dacf ed5e3c054e
commit 41f9d4f5fa
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -465,6 +465,7 @@ Renderer::Renderer()
g_ogl_config.bSupports2DTextureStorage = GLExtensions::Supports("GL_ARB_texture_storage_multisample");
g_ogl_config.bSupportsEarlyFragmentTests = GLExtensions::Supports("GL_ARB_shader_image_load_store");
g_ogl_config.bSupportsConservativeDepth = GLExtensions::Supports("GL_ARB_conservative_depth");
g_ogl_config.bSupportsAniso = GLExtensions::Supports("GL_EXT_texture_filter_anisotropic");
if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGLES3)
{

1
Source/Core/VideoBackends/OGL/Render.h
View File

@ -52,6 +52,7 @@ struct VideoConfig
bool bSupports3DTextureStorage;
bool bSupportsEarlyFragmentTests;
bool bSupportsConservativeDepth;
bool bSupportsAniso;
const char* gl_vendor;
const char* gl_renderer;

4
Source/Core/VideoBackends/OGL/SamplerCache.cpp
View File

@ -129,12 +129,10 @@ void SamplerCache::SetParameters(GLuint sampler_id, const Params& params)
glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_LOD, tm1.max_lod / 16.f);
if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
{
glSamplerParameterf(sampler_id, GL_TEXTURE_LOD_BIAS, (s32)tm0.lod_bias / 32.f);
if (g_ActiveConfig.iMaxAnisotropy > 0)
if (g_ActiveConfig.iMaxAnisotropy > 0 && g_ogl_config.bSupportsAniso)
glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)(1 << g_ActiveConfig.iMaxAnisotropy));
}
}
void SamplerCache::Clear()