diff options
| author | Brian Paul <[email protected]> | 2009-09-21 14:49:46 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-09-21 14:49:46 -0600 |
| commit | 6559eaef59526a7f4b2c22927637091018535c0c (patch) | |
| tree | caffa9fca6393dd04fa7f2622d00795f374b18c4 | |
| parent | 2655d437569c5bce7c56782792cbd4460b9f758b (diff) | |
| parent | 2b83483fb43386bd4b8d199d371a3e513828695f (diff) | |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_sample.c | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_texfilter.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c index a1d3bade27a..f99a30277dd 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.c +++ b/src/gallium/drivers/softpipe/sp_tex_sample.c @@ -464,7 +464,7 @@ choose_cube_face(float rx, float ry, float rz, float *newS, float *newT) unsigned face; float sc, tc, ma; - if (arx > ary && arx > arz) { + if (arx >= ary && arx >= arz) { if (rx >= 0.0F) { face = PIPE_TEX_FACE_POS_X; sc = -rz; @@ -478,7 +478,7 @@ choose_cube_face(float rx, float ry, float rz, float *newS, float *newT) ma = arx; } } - else if (ary > arx && ary > arz) { + else if (ary >= arx && ary >= arz) { if (ry >= 0.0F) { face = PIPE_TEX_FACE_POS_Y; sc = rx; diff --git a/src/mesa/swrast/s_texfilter.c b/src/mesa/swrast/s_texfilter.c index 6b1f9346475..efe6f234740 100644 --- a/src/mesa/swrast/s_texfilter.c +++ b/src/mesa/swrast/s_texfilter.c @@ -1862,7 +1862,7 @@ choose_cube_face(const struct gl_texture_object *texObj, GLuint face; GLfloat sc, tc, ma; - if (arx > ary && arx > arz) { + if (arx >= ary && arx >= arz) { if (rx >= 0.0F) { face = FACE_POS_X; sc = -rz; @@ -1876,7 +1876,7 @@ choose_cube_face(const struct gl_texture_object *texObj, ma = arx; } } - else if (ary > arx && ary > arz) { + else if (ary >= arx && ary >= arz) { if (ry >= 0.0F) { face = FACE_POS_Y; sc = rx; |