aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-05 15:55:59 +0200
committermarha <marha@users.sourceforge.net>2012-09-05 15:55:59 +0200
commit046f1422921cf63104f394a430634d364a8fd35a (patch)
tree5d49eef25d6c128ea369383e8de2a0e5a5dcf1c3 /mesalib/src/mesa/main
parentf2c10b20ce3f657c1f2013057602bb439816940f (diff)
parent50fad5cd2be4cd105c99687e224da60233f81645 (diff)
downloadvcxsrv-046f1422921cf63104f394a430634d364a8fd35a.tar.gz
vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.tar.bz2
vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/dix/dispatch.c
Diffstat (limited to 'mesalib/src/mesa/main')
-rw-r--r--mesalib/src/mesa/main/macros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/macros.h b/mesalib/src/mesa/main/macros.h
index fc6f2a28f..04d59d79c 100644
--- a/mesalib/src/mesa/main/macros.h
+++ b/mesalib/src/mesa/main/macros.h
@@ -711,7 +711,7 @@ DIFFERENT_SIGNS(GLfloat x, GLfloat y)
fi_type xfi, yfi;
xfi.f = x;
yfi.f = y;
- return (xfi.i ^ yfi.i) & (1u << 31);
+ return !!((xfi.i ^ yfi.i) & (1u << 31));
#else
/* Could just use (x*y<0) except for the flatshading requirements.
* Maybe there's a better way?