From: Michal Krol <michal@vmware.com>
Date: Fri, 18 Sep 2009 13:36:59 +0000 (+0100)
Subject: softpipe: Fix cube face selection.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de685b37a91bc95dd4093a44a49b7b47385b1f7c;p=mesa.git

softpipe: Fix cube face selection.

If arx and ary are equal, we still want to choose from one of them,
and not arz.
---

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;