Module: Mesa Branch: master Commit: 8aa381e3cd848f051931f86af5fdcd59921916ee URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8aa381e3cd848f051931f86af5fdcd59921916ee
Author: Eric Anholt <e...@anholt.net> Date: Wed Feb 11 14:57:55 2015 -0800 mesa: Make bitset.h not rely on Mesa-specific types and functions. Note that we can't use u_math.h's align() because it's a function instead of a macro, while BITSET_DECLARE needs a constant expression for nouveau's usage in global declarations. v2: Stick some parens around the bits macro argument usage (review by Jose). Reviewed-by: Jose Fonseca <jfons...@vmware.com> --- src/mesa/main/bitset.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h index 2558da4..17c5d5d 100644 --- a/src/mesa/main/bitset.h +++ b/src/mesa/main/bitset.h @@ -31,19 +31,18 @@ #ifndef BITSET_H #define BITSET_H -#include "imports.h" -#include "macros.h" +#include "util/u_math.h" /**************************************************************************** * generic bitset implementation */ -#define BITSET_WORD GLuint +#define BITSET_WORD unsigned int #define BITSET_WORDBITS (sizeof (BITSET_WORD) * 8) /* bitset declarations */ -#define BITSET_WORDS(bits) (ALIGN(bits, BITSET_WORDBITS) / BITSET_WORDBITS) +#define BITSET_WORDS(bits) (((bits) + BITSET_WORDBITS - 1) / BITSET_WORDBITS) #define BITSET_DECLARE(name, bits) BITSET_WORD name[BITSET_WORDS(bits)] /* bitset operations _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit
