diff options
| author | Nicolai Haehnle <nhaehnle@gmail.com> | 2007-03-24 14:41:59 +0100 |
|---|---|---|
| committer | Nicolai Haehnle <nhaehnle@gmail.com> | 2007-03-24 14:42:49 +0100 |
| commit | 8f90822b7264a6e569707fb187a77de57a6e6dac (patch) | |
| tree | e0b9cc900e193850a4a8db5ac79ddea56461cce0 | |
| parent | ea3d11a3d8901d650eb2a858ce30abae2d20d278 (diff) | |
swrast: Fix crash when sampling from a non-existing texture object
| -rw-r--r-- | src/mesa/swrast/s_context.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 1c9a098a2d5..f5f04b05f5a 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -505,9 +505,7 @@ _swrast_update_texture_samplers(GLcontext *ctx) for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++) { const struct gl_texture_object *tObj = ctx->Texture.Unit[u]._Current; - if (tObj) - swrast->TextureSample[u] = - _swrast_choose_texture_sample_func(ctx, tObj); + swrast->TextureSample[u] = _swrast_choose_texture_sample_func(ctx, tObj); } } |