mesa: Branch 'master'

[Brian Paul]

 src/mesa/swrast/s_texfilter.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree 1e2b46963595e02172b4d651cc8a219e9f5c8176 (from 7d8ed0f5f5960a492734cb415b8a85ef4ad79846)
Author: Etienne Clement <etienne.clement at autodesk.com>
Date:   Wed Feb 14 13:21:12 2007 -0700

    test for POT before using sample_2d_linear_repeat()

diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c
index f55e234..b2c5574 100644
--- a/src/mesa/swrast/s_texfilter.c
+++ b/src/mesa/swrast/s_texfilter.c
@@ -1196,7 +1196,9 @@ sample_linear_2d( GLcontext *ctx,
    GLuint i;
    struct gl_texture_image *image = tObj->Image[0][tObj->BaseLevel];
    (void) lambda;
-   if (tObj->WrapS == GL_REPEAT && tObj->WrapT == GL_REPEAT) {
+   if (tObj->WrapS == GL_REPEAT &&
+       tObj->WrapT == GL_REPEAT &&
+       image->_IsPowerOfTwo) {
       for (i=0;i<n;i++) {
          sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]);
       }