From 1a82081db6e57eaa74f852ed8acb391a7f4c2ca6 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Sun, 7 Jul 2013 18:38:38 -0700 Subject: [PATCH] mesa: Move ROUND_DOWN_TO() macro from i915/i965 to macros.h. This seems generally useful, so it may as well live in core Mesa. In fact, the comment for ALIGN() in macros.h actually says to "see also" ROUND_DOWN_TO, which...was in a driver somewhere. Signed-off-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/mesa/drivers/dri/i915/intel_context.h | 13 ------------- src/mesa/main/macros.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index 6edb1895d9c..32730a115ce 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -293,19 +293,6 @@ extern char *__progname; #define SUBPIXEL_X 0.125 #define SUBPIXEL_Y 0.125 -/** - * Align a value down to an alignment value - * - * If \c value is not already aligned to the requested alignment value, it - * will be rounded down. - * - * \param value Value to be rounded - * \param alignment Alignment value to be used. This must be a power of two. - * - * \sa ALIGN() - */ -#define ROUND_DOWN_TO(value, alignment) ((value) & ~(alignment - 1)) - static INLINE uint32_t U_FIXED(float value, uint32_t frac_bits) { diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 05aad4eb8b1..4bb17d8d174 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -675,6 +675,18 @@ minify(unsigned value, unsigned levels) */ #define ALIGN(value, alignment) (((value) + (alignment) - 1) & ~((alignment) - 1)) +/** + * Align a value down to an alignment value + * + * If \c value is not already aligned to the requested alignment value, it + * will be rounded down. + * + * \param value Value to be rounded + * \param alignment Alignment value to be used. This must be a power of two. + * + * \sa ALIGN() + */ +#define ROUND_DOWN_TO(value, alignment) ((value) & ~(alignment - 1)) /** Cross product of two 3-element vectors */ -- 2.30.2