diff options
| author | Brian Paul <[email protected]> | 2011-09-26 14:39:52 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-09-26 14:43:56 -0600 |
| commit | c5943d6c1cc4eedbea088bc1f611abc153e90524 (patch) | |
| tree | 0bf2a3da9eb9e4e50bf111459e077378f3996deb /src/mesa/swrast/s_context.c | |
| parent | e0553f6d4b9ec524bffd94dc6f72efe4ea50a347 (diff) | |
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
Diffstat (limited to 'src/mesa/swrast/s_context.c')
| -rw-r--r-- | 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 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); } } |