aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/swrast/s_span.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-12 13:48:18 +0000
committermarha <marha@users.sourceforge.net>2011-04-12 13:48:18 +0000
commite2c8d047679db3bbb166d709b86e18180be6d713 (patch)
treed7468ac76dc71bb8d38c816be6db988bcbcbb863 /mesalib/src/mesa/swrast/s_span.c
parent57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (diff)
parent7730393619080086530e24d3b594351b4114f608 (diff)
downloadvcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.gz
vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.tar.bz2
vcxsrv-e2c8d047679db3bbb166d709b86e18180be6d713.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/swrast/s_span.c')
-rw-r--r--mesalib/src/mesa/swrast/s_span.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c
index 75e3c53a1..f0222f5a0 100644
--- a/mesalib/src/mesa/swrast/s_span.c
+++ b/mesalib/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;