diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-22 14:29:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-22 14:29:51 +0000 |
| commit | 016747a04df9d4474489fe3b3d1c0f11a713148b (patch) | |
| tree | 69722f37ac06c00d6674c7bf2df6597753b418e6 /mesalib/src/mesa/swrast/s_texcombine.c | |
| parent | 32a666fa1f26defd3b4e508b75f1acf6e2900a40 (diff) | |
| parent | 52011cfedaa930d61d8f60b283a2051093727582 (diff) | |
| download | vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.gz vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.bz2 vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/swrast/s_texcombine.c')
| -rw-r--r-- | mesalib/src/mesa/swrast/s_texcombine.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mesalib/src/mesa/swrast/s_texcombine.c b/mesalib/src/mesa/swrast/s_texcombine.c index 30cd8194d..53ef2f890 100644 --- a/mesalib/src/mesa/swrast/s_texcombine.c +++ b/mesalib/src/mesa/swrast/s_texcombine.c @@ -710,6 +710,18 @@ _swrast_texture_span( struct gl_context *ctx, SWspan *span ) }
}
}
+ else if (curObj->Sampler.MaxAnisotropy > 1.0 &&
+ curObj->Sampler.MinFilter == GL_LINEAR_MIPMAP_LINEAR) {
+ /* sample_lambda_2d_aniso is beeing used as texture_sample_func,
+ * it requires the current SWspan *span as an additional parameter.
+ * In order to keep the same function signature, the unused lambda
+ * parameter will be modified to actually contain the SWspan pointer.
+ * This is a Hack. To make it right, the texture_sample_func
+ * signature and all implementing functions need to be modified.
+ */
+ /* "hide" SWspan struct; cast to (GLfloat *) to suppress warning */
+ lambda = (GLfloat *)span;
+ }
/* Sample the texture (span->end = number of fragments) */
swrast->TextureSample[unit]( ctx, texUnit->_Current, span->end,
|