summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Krol <[email protected]>2009-09-18 14:36:59 +0100
committerMichal Krol <[email protected]>2009-09-18 14:36:59 +0100
commitde685b37a91bc95dd4093a44a49b7b47385b1f7c (patch)
tree0afeb52a3a077767d07a0382e6e63ab912b91fb9
parentfb2c7b6743ba6e89f24843890fb7fcd6a09c3dbb (diff)
softpipe: Fix cube face selection.
If arx and ary are equal, we still want to choose from one of them, and not arz.
-rw-r--r--src/gallium/drivers/softpipe/sp_tex_sample.c4
1 files changed, 2 insertions, 2 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;