From: Brian Paul <brianp@vmware.com>
Date: Mon, 26 Sep 2011 20:39:52 +0000 (-0600)
Subject: swrast: always call _swrast_choose_texture_sample_func()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5943d6c1cc4eedbea088bc1f611abc153e90524;p=mesa.git

swrast: always call _swrast_choose_texture_sample_func()

_swrast_choose_texture_sample_func() handles null texture object pointers
and will return the "null" sampler function which returns (0,0,0,1).  This
fixes a minor regression from ce82914f5ad4bb9148370826099925590e9798fd
---

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 0c33dff1254..a4acac23336 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -476,8 +476,8 @@ _swrast_update_texture_samplers(struct gl_context *ctx)
        */
       if (tObj) {
          _mesa_update_fetch_functions(tObj);
-         swrast->TextureSample[u] = _swrast_choose_texture_sample_func(ctx, tObj);
       }
+      swrast->TextureSample[u] = _swrast_choose_texture_sample_func(ctx, tObj);
    }
 }