projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1D convolution (and post-conv scale/bias) were inadvertantly applied to 2D image...
[mesa.git]
/
src
/
mesa
/
swrast
/
s_texfilter.c
diff --git
a/src/mesa/swrast/s_texfilter.c
b/src/mesa/swrast/s_texfilter.c
index f55e23422d413b5b85f93742712fe810acfe82cf..b2c5574d95d06a782d0af290e41152502ba734f6 100644
(file)
--- 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;
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]);
}
for (i=0;i<n;i++) {
sample_2d_linear_repeat(ctx, tObj, image, texcoords[i], rgba[i]);
}