Mesa (master): swrast: always call _swrast_choose_texture_sample_func()

[Brian Paul]

Module: Mesa
Branch: master
Commit: c5943d6c1cc4eedbea088bc1f611abc153e90524
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c5943d6c1cc4eedbea088bc1f611abc153e90524

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Sep 26 14:39:52 2011 -0600

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

---

 src/mesa/swrast/s_context.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index 0c33dff..a4acac2 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);
    }
 }