From 8706395f25228d0e622cc56346c7181ba102edf4 Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Mon, 17 Dec 2012 13:48:21 -0800 Subject: [PATCH] mesa: Add ALIGN() macro to main/macros.h. Previously this macro existed in 3 separate places, some inside the intel driver and some outside of it. It makes more sense to have it in main/macros.h Reviewed-by: Brian Paul Reviewed-by: Kenneth Graunke --- src/glsl/linker.cpp | 2 -- src/mesa/drivers/dri/i965/brw_context.h | 1 + src/mesa/drivers/dri/intel/intel_context.h | 13 ------------- src/mesa/main/extensions.c | 3 +-- src/mesa/main/macros.h | 13 +++++++++++++ 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp index be08156e068..c5c462b7dd2 100644 --- a/src/glsl/linker.cpp +++ b/src/glsl/linker.cpp @@ -76,8 +76,6 @@ extern "C" { #include "main/shaderobj.h" } -#define ALIGN(value, alignment) (((value) + alignment - 1) & ~(alignment - 1)) - /** * Visitor that determines whether or not a variable is ever written. */ diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index eba9eb59016..c7fc5864d80 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -36,6 +36,7 @@ #include "intel_context.h" #include "brw_structs.h" #include "main/imports.h" +#include "main/macros.h" #ifdef __cplusplus extern "C" { diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index 8d544dccaef..dbc5ea02bcf 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -349,19 +349,6 @@ extern char *__progname; #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) -/** - * Align a value up to an alignment value - * - * If \c value is not already aligned to the requested alignment value, it - * will be rounded up. - * - * \param value Value to be rounded - * \param alignment Alignment value to be used. This must be a power of two. - * - * \sa ROUND_DOWN_TO() - */ -#define ALIGN(value, alignment) (((value) + alignment - 1) & ~(alignment - 1)) - /** * Align a value down to an alignment value * diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 98711b395aa..3486b65a4d3 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -34,11 +34,10 @@ #include "imports.h" #include "context.h" #include "extensions.h" +#include "macros.h" #include "mfeatures.h" #include "mtypes.h" -#define ALIGN(value, alignment) (((value) + alignment - 1) & ~(alignment - 1)) - enum { DISABLE = 0, GLL = 1 << API_OPENGL_COMPAT, /* GL Legacy / Compatibility */ diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h index 14a5d5fe16e..d1e81fe082c 100644 --- a/src/mesa/main/macros.h +++ b/src/mesa/main/macros.h @@ -656,6 +656,19 @@ INTERP_4F(GLfloat t, GLfloat dst[4], const GLfloat out[4], const GLfloat in[4]) #define MIN3( A, B, C ) ((A) < (B) ? MIN2(A, C) : MIN2(B, C)) #define MAX3( A, B, C ) ((A) > (B) ? MAX2(A, C) : MAX2(B, C)) +/** + * Align a value up to an alignment value + * + * If \c value is not already aligned to the requested alignment value, it + * will be rounded up. + * + * \param value Value to be rounded + * \param alignment Alignment value to be used. This must be a power of two. + * + * \sa ROUND_DOWN_TO() + */ +#define ALIGN(value, alignment) (((value) + alignment - 1) & ~(alignment - 1)) + /** Cross product of two 3-element vectors */ -- 2.30.2