diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2015-11-19 12:42:16 +0100 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2015-11-19 12:42:16 +0100 |
| commit | 41f9d4f5fa8934ac7dd13cc4ac31cb90d29b97a8 (patch) | |
| tree | 09c95efe4aebd9bf28ba72f9ac7dd1895fe0e807 /Source/Core/VideoBackends | |
| parent | 1f4b16dacfae71c0479c5a63452adcc25ea32337 (diff) | |
| parent | ed5e3c054e58b7547cead222048676f32ce8858d (diff) | |
Merge pull request #3271 from Sonicadvance1/es_sampler_cache
Enable Anisotropic filtering in ES.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/Render.h | 1 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/SamplerCache.cpp | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 4c45fa6701..86c3bcb492 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -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) { diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h index 35bf14e75c..a6544a6049 100644 --- a/Source/Core/VideoBackends/OGL/Render.h +++ b/Source/Core/VideoBackends/OGL/Render.h @@ -52,6 +52,7 @@ struct VideoConfig bool bSupports3DTextureStorage; bool bSupportsEarlyFragmentTests; bool bSupportsConservativeDepth; + bool bSupportsAniso; const char* gl_vendor; const char* gl_renderer; diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.cpp b/Source/Core/VideoBackends/OGL/SamplerCache.cpp index b1f7d40fa7..3c9a258ffb 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.cpp +++ b/Source/Core/VideoBackends/OGL/SamplerCache.cpp @@ -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) - glSamplerParameterf(sampler_id, GL_TEXTURE_MAX_ANISOTROPY_EXT, (float)(1 << g_ActiveConfig.iMaxAnisotropy)); - } + 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() |
