From 54715e898916e868f821cddc559ee276b6f8a1d4 Mon Sep 17 00:00:00 2001
From: Yonggang Luo <luoyonggang@gmail.com>
Date: Fri, 14 Nov 2025 01:06:45 +0800
Subject: [PATCH] util: Getting util_align_npot to be same with ALIGN_NPOT so
 it can be merged latter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38431>
---
 src/util/u_math.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/util/u_math.h b/src/util/u_math.h
index 1c96ac69e10..354683bb4ce 100644
--- a/src/util/u_math.h
+++ b/src/util/u_math.h
@@ -707,9 +707,8 @@ align_uintptr(uintptr_t value, uintptr_t alignment)
 static inline size_t
 util_align_npot(size_t value, size_t alignment)
 {
-   if (value % alignment)
-      return value + (alignment - (value % alignment));
-   return value;
+   assert(alignment > 0);
+   return (value + alignment - 1) / alignment * alignment;
 }
 
 static inline size_t