From c5943d6c1cc4eedbea088bc1f611abc153e90524 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 26 Sep 2011 14:39:52 -0600 Subject: [PATCH] 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 file changed, 1 insertion(+), 1 deletion(-) 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); } } -- 2.7.4