From: Nanley Chery Date: Tue, 2 Jun 2015 18:03:22 +0000 (-0700) Subject: mesa/macros: move ALIGN_NPOT to macros.h X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54d2aa4258f0bfcc669b2bc4e82332f7ff4876dd;p=mesa.git mesa/macros: move ALIGN_NPOT to macros.h Aligning with a non-power-of-two number is a general task that can be used in various places. This commit is required for the next one. v2: add greater than 0 assertion (Anuj). convert the macro to a static inline function. Reviewed-by: Anuj Phogat Signed-off-by: Nanley Chery --- diff --git a/src/mesa/drivers/dri/i965/intel_upload.c b/src/mesa/drivers/dri/i965/intel_upload.c index 870aabc8863..deaae6c7ed5 100644 --- a/src/mesa/drivers/dri/i965/intel_upload.c +++ b/src/mesa/drivers/dri/i965/intel_upload.c @@ -44,12 +44,6 @@ #define INTEL_UPLOAD_SIZE (64*1024) -/** - * Like ALIGN(), but works with a non-power-of-two alignment. - */ -#define ALIGN_NPOT(value, alignment) \ - (((value) + (alignment) - 1) / (alignment) * (alignment)) - void intel_upload_finish(struct brw_context *brw) { diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index c3ef42a4282..ed207d44a64 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -697,6 +697,16 @@ ALIGN(uintptr_t value, int32_t alignment) return (((value) + (alignment) - 1) & ~((alignment) - 1)); } +/** + * Like ALIGN(), but works with a non-power-of-two alignment. + */ +static inline uintptr_t +ALIGN_NPOT(uintptr_t value, int32_t alignment) +{ + assert(alignment > 0); + return (value + alignment - 1) / alignment * alignment; +} + /** * Align a value down to an alignment value *