diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-11-23 09:14:39 -0700 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-11-23 09:14:39 -0700 |
| commit | c14d969a69d7b9a060c6701d3f18c51eabc56635 (patch) | |
| tree | 3400e73235ed174124fa5d93ce031cf6aeb25900 | |
| parent | 0fd679a1903d997b53fe20b86821a58c1a66262f (diff) | |
need to check border width in sample_linear_2d() - fixes failed assertion in texwrap.c test
| -rw-r--r-- | src/mesa/swrast/s_texfilter.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c index 1a779c800..a5594ac62 100644 --- a/src/mesa/swrast/s_texfilter.c +++ b/src/mesa/swrast/s_texfilter.c @@ -1191,7 +1191,8 @@ sample_linear_2d( GLcontext *ctx, (void) lambda; if (tObj->WrapS == GL_REPEAT && tObj->WrapT == GL_REPEAT && - image->_IsPowerOfTwo) { + image->_IsPowerOfTwo && + image->Border == 0) { for (i=0;i<n;i++) { sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]); } |