diff options
| author | Brian <brian@yutani.localnet.net> | 2007-02-22 08:53:33 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-02-22 08:53:33 -0700 |
| commit | 29c471aafc6a3fef23d553e31a555d1782854a77 (patch) | |
| tree | 335385fd55d510118346136c6feb4daa707988b6 /src/mesa/swrast/s_texfilter.c | |
| parent | 6d4cf6be4e79c3a6ab18272577df17389e3834a6 (diff) | |
| parent | a4b344baa2484c65a1618f3cce3a94c91dea8ef7 (diff) | |
Merge branch 'origin' into glsl-compiler-1
Conflicts:
src/mesa/main/state.c
src/mesa/shader/program.c
src/mesa/shader/program.h
src/mesa/shader/programopt.c
src/mesa/shader/slang/slang_execute.c
src/mesa/sources
src/mesa/swrast/s_arbshader.c
src/mesa/swrast/s_context.c
src/mesa/swrast/s_span.c
src/mesa/swrast/s_zoom.c
src/mesa/tnl/t_context.c
src/mesa/tnl/t_save_api.c
src/mesa/tnl/t_vb_arbprogram.c
src/mesa/tnl/t_vp_build.c
src/mesa/tnl/t_vtx_eval.c
Diffstat (limited to 'src/mesa/swrast/s_texfilter.c')
| -rw-r--r-- | src/mesa/swrast/s_texfilter.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c index f55e23422d..b2c5574d95 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]); } |