summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-08-25 03:05:10 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-08-25 03:05:10 +0000
commit9e385282fc51b5852bfcfa981d672173488cd5c5 (patch)
treec7a8e3c37dd9c4fdb540b1b7ec43e34c11243371 /src/mesa
parent5d7c486d9092fdfba68f50374ebf9ab06c37149a (diff)
also check for texture border in sample_linear_2d()
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/swrast/s_texture.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index c4ac9679ec..c75d826d2c 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.4
*
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
*
@@ -1181,7 +1181,8 @@ sample_linear_2d( GLcontext *ctx, GLuint texUnit,
struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
(void) texUnit;
(void) lambda;
- if (tObj->WrapS == GL_REPEAT && tObj->WrapT == GL_REPEAT) {
+ if (tObj->WrapS == GL_REPEAT && tObj->WrapT == GL_REPEAT
+ && image->Border == 0) {
for (i=0;i<n;i++) {
sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]);
}