[Bf-blender-cvs] [47bdb288412] master: GPUTexture: Fix samplers configuration typo

Clément Foucault noreply at git.blender.org
Wed Jun 3 16:24:13 CEST 2020


Commit: 47bdb288412db819672b3b8345b18f36c4f96373
Author: Clément Foucault
Date:   Wed Jun 3 14:48:35 2020 +0200
Branches: master
https://developer.blender.org/rB47bdb288412db819672b3b8345b18f36c4f96373

GPUTexture: Fix samplers configuration typo

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

M	source/blender/gpu/intern/gpu_texture.c

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

diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c
index 4ae897600e0..1e5f7d753b2 100644
--- a/source/blender/gpu/intern/gpu_texture.c
+++ b/source/blender/gpu/intern/gpu_texture.c
@@ -2134,9 +2134,9 @@ void GPU_samplers_init(void)
   for (int i = 0; i < GPU_SAMPLER_MAX; i++) {
     eGPUSamplerState state = i;
     GLenum clamp_type = (state & GPU_SAMPLER_CLAMP_BORDER) ? GL_CLAMP_TO_BORDER : GL_CLAMP_TO_EDGE;
-    GLenum wrap_s = (state & GPU_SAMPLER_REPEAT_R) ? GL_REPEAT : clamp_type;
-    GLenum wrap_t = (state & GPU_SAMPLER_REPEAT_S) ? GL_REPEAT : clamp_type;
-    GLenum wrap_r = (state & GPU_SAMPLER_REPEAT_T) ? GL_REPEAT : clamp_type;
+    GLenum wrap_s = (state & GPU_SAMPLER_REPEAT_S) ? GL_REPEAT : clamp_type;
+    GLenum wrap_t = (state & GPU_SAMPLER_REPEAT_T) ? GL_REPEAT : clamp_type;
+    GLenum wrap_r = (state & GPU_SAMPLER_REPEAT_R) ? GL_REPEAT : clamp_type;
     GLenum mag_filter = (state & GPU_SAMPLER_FILTER) ? GL_LINEAR : GL_NEAREST;
     GLenum min_filter = (state & GPU_SAMPLER_FILTER) ?
                             ((state & GPU_SAMPLER_MIPMAP) ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR) :



More information about the Bf-blender-cvs mailing list