diff options
| author | marha <marha@users.sourceforge.net> | 2013-10-07 08:23:46 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-10-07 08:23:46 +0200 |
| commit | 81fd17c8678e89cea6610b8b2996b028b21eb5dc (patch) | |
| tree | d2c201976b3cd000658870071ab7b533359de039 /mesalib/src/gallium/auxiliary/util/u_pack_color.h | |
| parent | 5593a3d2f370e3e12a043110bf2e395c938980d6 (diff) | |
| download | vcxsrv-81fd17c8678e89cea6610b8b2996b028b21eb5dc.tar.gz vcxsrv-81fd17c8678e89cea6610b8b2996b028b21eb5dc.tar.bz2 vcxsrv-81fd17c8678e89cea6610b8b2996b028b21eb5dc.zip | |
xserver fontconfig libXdmcp mesa pixmand xkeyboard-config git update 7 oct 2013
xserver commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a
xkeyboard-config commit c8326b7d12b20eccfd38d661b95d9b23d8a56e27
libXdmcp commit 089081dca4ba3598c6f9bf401c029378943b5854
pixman commit c89f4c826695dbb5df0817d84f845dbd3e28b7a7
fontconfig commit 604c2a683f1357fc65bad372b5d25a90099f827f
mesa commit cfbfb50cb8d47b7f6975828b504936f9324f3b12
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_pack_color.h')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_pack_color.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_pack_color.h b/mesalib/src/gallium/auxiliary/util/u_pack_color.h index 102ad6051..36252738d 100644 --- a/mesalib/src/gallium/auxiliary/util/u_pack_color.h +++ b/mesalib/src/gallium/auxiliary/util/u_pack_color.h @@ -528,12 +528,12 @@ util_pack_z(enum pipe_format format, double z) case PIPE_FORMAT_Z16_UNORM: if (z == 1.0) return 0xffff; - return (uint32_t) (z * 0xffff); + return (uint32_t) lrint(z * 0xffff); case PIPE_FORMAT_Z32_UNORM: /* special-case to avoid overflow */ if (z == 1.0) return 0xffffffff; - return (uint32_t) (z * 0xffffffff); + return (uint32_t) llrint(z * 0xffffffff); case PIPE_FORMAT_Z32_FLOAT: fui.f = (float)z; return fui.ui; @@ -541,12 +541,12 @@ util_pack_z(enum pipe_format format, double z) case PIPE_FORMAT_Z24X8_UNORM: if (z == 1.0) return 0xffffff; - return (uint32_t) (z * 0xffffff); + return (uint32_t) lrint(z * 0xffffff); case PIPE_FORMAT_S8_UINT_Z24_UNORM: case PIPE_FORMAT_X8Z24_UNORM: if (z == 1.0) return 0xffffff00; - return ((uint32_t) (z * 0xffffff)) << 8; + return ((uint32_t) lrint(z * 0xffffff)) << 8; case PIPE_FORMAT_S8_UINT: /* this case can get it via util_pack_z_stencil() */ return 0; |