summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-11-23 09:14:27 -0700
committerBrian <[email protected]>2007-11-23 09:14:27 -0700
commit6ccd23b87b9d07ce01bb84d406b64fb18d37a33e (patch)
treebe26f822308d5e0a002f6f9af35f3efe992d454d /src
parent823409b7d09cab74db3715de5f1e1685fe0fc70d (diff)
need to check border width in sample_linear_2d() - fixes failed assertion in texwrap.c test
Diffstat (limited to 'src')
-rw-r--r--src/mesa/swrast/s_texfilter.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c
index 91d207147e5..084d65f554a 100644
--- a/src/mesa/swrast/s_texfilter.c
+++ b/src/mesa/swrast/s_texfilter.c
@@ -1198,6 +1198,7 @@ sample_linear_2d( GLcontext *ctx,
(void) lambda;
if (tObj->WrapS == GL_REPEAT &&
tObj->WrapT == GL_REPEAT &&
+ image->Border == 0 &&
image->_IsPowerOfTwo) {
for (i=0;i<n;i++) {
sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]);