From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 29 Jul 2016 13:00:12 +0000 (+0200)
Subject: gallium/util: fix align64
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6db93cd167d3ae04688c192806aad54a05a9d161;p=mesa.git

gallium/util: fix align64

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>
---

diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h
index c94967e8a42..1661e63dbdd 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);
 }
 
 /**