diff options
author | marha <marha@users.sourceforge.net> | 2012-08-03 08:16:19 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-08-03 09:35:02 +0200 |
commit | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (patch) | |
tree | a6124cc965bba51de50907418ce63ab4540f582d /mesalib/src/mesa/swrast/s_span.c | |
parent | 49838240b7d4cff1ffed1bd91e495f6919061f90 (diff) | |
download | vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.tar.gz vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.tar.bz2 vcxsrv-18e75aa6ae27a6e44d93babd96afbbe0cd6077c8.zip |
pixman mesa git update 3 Aug 2012
Diffstat (limited to 'mesalib/src/mesa/swrast/s_span.c')
-rw-r--r-- | mesalib/src/mesa/swrast/s_span.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/src/mesa/swrast/s_span.c b/mesalib/src/mesa/swrast/s_span.c index 627ef1136..ef51479fd 100644 --- a/mesalib/src/mesa/swrast/s_span.c +++ b/mesalib/src/mesa/swrast/s_span.c @@ -38,6 +38,7 @@ #include "main/macros.h" #include "main/imports.h" #include "main/image.h" +#include "main/samplerobj.h" #include "s_atifragshader.h" #include "s_alpha.h" @@ -497,14 +498,15 @@ interpolate_texcoords(struct gl_context *ctx, SWspan *span) const struct gl_texture_image *img = obj->Image[0][obj->BaseLevel]; const struct swrast_texture_image *swImg = swrast_texture_image_const(img); + const struct gl_sampler_object *samp = _mesa_get_samplerobj(ctx, u); - needLambda = (obj->Sampler.MinFilter != obj->Sampler.MagFilter) + needLambda = (samp->MinFilter != samp->MagFilter) || _swrast_use_fragment_program(ctx); /* LOD is calculated directly in the ansiotropic filter, we can * skip the normal lambda function as the result is ignored. */ - if (obj->Sampler.MaxAnisotropy > 1.0 && - obj->Sampler.MinFilter == GL_LINEAR_MIPMAP_LINEAR) { + if (samp->MaxAnisotropy > 1.0 && + samp->MinFilter == GL_LINEAR_MIPMAP_LINEAR) { needLambda = GL_FALSE; } texW = swImg->WidthScale; |