[Mesa-dev] [PATCH] mesa/macros: move ALIGN_NPOT to macros.h
Anuj Phogat
anuj.phogat at gmail.com
Fri Jun 26 12:57:54 PDT 2015
On Fri, Jun 26, 2015 at 11:39 AM, Nanley Chery <nanleychery at gmail.com> wrote:
> From: Nanley Chery <nanley.g.chery at intel.com>
>
> 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.
>
> Signed-off-by: Nanley Chery <nanley.g.chery at intel.com>
> ---
> src/mesa/drivers/dri/i965/intel_upload.c | 6 ------
> src/mesa/main/macros.h | 10 ++++++++++
> 2 files changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/intel_upload.c b/src/mesa/drivers/dri/i965/intel_upload.c
> index 870aabc..deaae6c 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 7f89447..1a587fb 100644
> --- a/src/mesa/main/macros.h
> +++ b/src/mesa/main/macros.h
> @@ -708,6 +708,16 @@ ALIGN(uintptr_t value, int32_t alignment)
> }
>
> /**
> + * 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
> *
> * If \c value is not already aligned to the requested alignment value, it
> --
> 2.4.4
>
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
More information about the mesa-dev
mailing list