diff options
| author | Brian Paul <[email protected]> | 2011-04-11 21:19:41 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2011-04-11 21:19:41 -0600 |
| commit | 1ca55854591d647a485364c2db67899e7f9aaae1 (patch) | |
| tree | d1125cca4e991429b465f158581f48a7e6d539b8 /src/mesa/swrast/s_span.c | |
| parent | 2432ca1c2e205100d48070305ba2d5f8978bce03 (diff) | |
| parent | 65b024d63a44464ecf752bec417281109f4bd81e (diff) | |
Merge branch 'arb_sampler_objects'
Diffstat (limited to 'src/mesa/swrast/s_span.c')
| -rw-r--r-- | src/mesa/swrast/s_span.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c index ef38a6b22b8..9cfecc9e3a4 100644 --- a/src/mesa/swrast/s_span.c +++ b/src/mesa/swrast/s_span.c @@ -490,7 +490,7 @@ interpolate_texcoords(struct gl_context *ctx, SWspan *span) if (obj) { const struct gl_texture_image *img = obj->Image[0][obj->BaseLevel]; - needLambda = (obj->MinFilter != obj->MagFilter) + needLambda = (obj->Sampler.MinFilter != obj->Sampler.MagFilter) || ctx->FragmentProgram._Current; texW = img->WidthScale; texH = img->HeightScale; |