projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb2c7b6
)
softpipe: Fix cube face selection.
author
Michal Krol
<michal@vmware.com>
Fri, 18 Sep 2009 13:36:59 +0000
(14:36 +0100)
committer
Michal Krol
<michal@vmware.com>
Fri, 18 Sep 2009 13:36:59 +0000
(14:36 +0100)
If arx and ary are equal, we still want to choose from one of them,
and not arz.
src/gallium/drivers/softpipe/sp_tex_sample.c
patch
|
blob
|
history
diff --git
a/src/gallium/drivers/softpipe/sp_tex_sample.c
b/src/gallium/drivers/softpipe/sp_tex_sample.c
index a1d3bade27afbe160bf9a28093b2b9d112c6efdf..f99a30277ddb997963f1fb9bcb4eb598aa14e96a 100644
(file)
--- 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;