Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEthan-Hall <Ethan1080>2022-03-21 15:46:12 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2022-03-21 16:10:13 +0300
commit32284f34e39b9612c5a291d6cd9e4985ec7de305 (patch)
treeea86a7778bcf098053ca93d5b1ddd0b1983cdba8
parente5487a81a414e0564a977f442e690f38d9ae4ebf (diff)
GPU: Allow the user to set an anisotropic filtering setting below the implementation-defined value of `GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT`
Allow the user to set an anisotropic filtering setting below the implementation-defined value of `GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT`. This bug-fix is also needed for 2.93 LTS. Reviewed By: fclem Differential Revision: https://developer.blender.org/D14392
-rw-r--r--source/blender/gpu/opengl/gl_texture.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/opengl/gl_texture.cc b/source/blender/gpu/opengl/gl_texture.cc
index d84d21d3021..2bcb2631de9 100644
--- a/source/blender/gpu/opengl/gl_texture.cc
+++ b/source/blender/gpu/opengl/gl_texture.cc
@@ -544,7 +544,7 @@ void GLTexture::samplers_update()
float max_anisotropy = 1.0f;
glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &max_anisotropy);
- float aniso_filter = max_ff(max_anisotropy, U.anisotropic_filter);
+ float aniso_filter = min_ff(max_anisotropy, U.anisotropic_filter);
for (int i = 0; i <= GPU_SAMPLER_ICON - 1; i++) {
eGPUSamplerState state = static_cast<eGPUSamplerState>(i);