Mesa (master): gallium/util: fix align64

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 6db93cd167d3ae04688c192806aad54a05a9d161
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6db93cd167d3ae04688c192806aad54a05a9d161

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Fri Jul 29 15:00:12 2016 +0200

gallium/util: fix align64

it cut off the upper 32 bits

Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>

---

 src/gallium/auxiliary/util/u_math.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index c94967e..1661e63 100644
--- a/src/gallium/auxiliary/util/u_math.h
+++ b/src/gallium/auxiliary/util/u_math.h
@@ -682,7 +682,7 @@ align(int value, int alignment)
 static inline uint64_t
 align64(uint64_t value, unsigned alignment)
 {
-   return (value + alignment - 1) & ~(alignment - 1);
+   return (value + alignment - 1) & ~((uint64_t)alignment - 1);
 }
 
 /**