diff options
| author | Brian Paul <brianp@vmware.com> | 2011-04-10 12:44:46 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-04-10 13:12:49 -0600 |
| commit | ecfaab88b2577bd0395bc05d75a036126806a9c4 (patch) | |
| tree | 5abb78f767f546778d551a57f7f2cfe20c479f50 /src/mesa/swrast/s_span.c | |
| parent | 1cbd3a1cc734df16610a59dc49cdb42c70dc3270 (diff) | |
| download | external_mesa3d-ecfaab88b2577bd0395bc05d75a036126806a9c4.zip external_mesa3d-ecfaab88b2577bd0395bc05d75a036126806a9c4.tar.gz external_mesa3d-ecfaab88b2577bd0395bc05d75a036126806a9c4.tar.bz2 | |
mesa: move sampler state into new gl_sampler_object type
gl_texture_object contains an instance of this type for the regular
texture object sampling state. glGenSamplers() generates new instances
of gl_sampler_object which can override that state with glBindSampler().
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 ef38a6b..9cfecc9 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; |