OSDN Git Service

gallium/util: fix align64
authorMarek Olšák <marek.olsak@amd.com>
Fri, 29 Jul 2016 13:00:12 +0000 (15:00 +0200)
committerEmil Velikov <emil.l.velikov@gmail.com>
Thu, 1 Sep 2016 09:06:23 +0000 (10:06 +0100)
it cut off the upper 32 bits

Cc: mesa-stable@lists.freedesktop.org
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
(cherry picked from commit 6db93cd167d3ae04688c192806aad54a05a9d161)

src/gallium/auxiliary/util/u_math.h

index ecb1d63..14fbb58 100644 (file)
@@ -829,7 +829,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);
 }
 
 /**