diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
| commit | 230fe896faed312ef22d915e871fb5aee3ecfad0 (patch) | |
| tree | 971b0c0899c72496f97970319bfadfae383abbea /mesalib/src/gallium/auxiliary/util/u_math.h | |
| parent | 180290f941da61bd80284d817e27c01cf789ee53 (diff) | |
| parent | b071050b9eda9d5e5185e582dbe9f4adba863ccc (diff) | |
| download | vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.gz vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.bz2 vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_math.h')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_math.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h index 607fbecb0..64d16cbe7 100644 --- a/mesalib/src/gallium/auxiliary/util/u_math.h +++ b/mesalib/src/gallium/auxiliary/util/u_math.h @@ -540,14 +540,13 @@ ubyte_to_float(ubyte ub) static INLINE ubyte float_to_ubyte(float f) { - const int ieee_0996 = 0x3f7f0000; /* 0.996 or so */ union fi tmp; tmp.f = f; if (tmp.i < 0) { return (ubyte) 0; } - else if (tmp.i >= ieee_0996) { + else if (tmp.i >= 0x3f800000 /* 1.0f */) { return (ubyte) 255; } else { |