summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorAlon Levy <alevy@redhat.com>2014-07-23 00:07:03 +0300
committerEmil Velikov <emil.l.velikov@gmail.com>2014-10-23 14:45:40 +0100
commit23080e49c4e209101602ec0630923bc1c7c29689 (patch)
tree0f4615f9e82be8a87b60eaf1c27e7f00fa08b103 /src/gallium
parent75ad4fe78e15353344cdd606916b0d512ae382b7 (diff)
downloadexternal_mesa3d-23080e49c4e209101602ec0630923bc1c7c29689.zip
external_mesa3d-23080e49c4e209101602ec0630923bc1c7c29689.tar.gz
external_mesa3d-23080e49c4e209101602ec0630923bc1c7c29689.tar.bz2
u_math.h: fix 64 to 32 bit truncation warning
Signed-off-by: Alon Levy <alevy@redhat.com> Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/auxiliary/util/u_math.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index f95c111..0113fb1 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -799,7 +799,7 @@ util_bswap64(uint64_t n)
#if defined(HAVE___BUILTIN_BSWAP64)
return __builtin_bswap64(n);
#else
- return ((uint64_t)util_bswap32(n) << 32) |
+ return ((uint64_t)util_bswap32((uint32_t)n) << 32) |
util_bswap32((n >> 32));
#endif
}