[Bf-blender-cvs] [3dc36b32a1e] blender-v2.93-release: GPU: Allow the user to set an anisotropic filtering setting below the implementation-defined value of `GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT`

[Ethan-Hall]

Commit: 3dc36b32a1e34fac8c1f266284ae0c44366c3a98
Author: Ethan-Hall
Date:   Mon Mar 21 13:46:12 2022 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rB3dc36b32a1e34fac8c1f266284ae0c44366c3a98

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

===================================================================

M	source/blender/gpu/opengl/gl_texture.cc

===================================================================

diff --git a/source/blender/gpu/opengl/gl_texture.cc b/source/blender/gpu/opengl/gl_texture.cc
index fe04c5084e2..9e075f77b9a 100644
--- a/source/blender/gpu/opengl/gl_texture.cc
+++ b/source/blender/gpu/opengl/gl_texture.cc
@@ -547,7 +547,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);