[Mesa-dev] [PATCH 4/7] mesa: Make bitset.h not rely on Mesa-specific types and functions.

[Jose Fonseca]

On 12/02/15 00:48, Eric Anholt wrote:
> 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.
> ---
>   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..6f9bed9 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)

bits -> (bits)

just in case...

>   #define BITSET_DECLARE(name, bits) BITSET_WORD name[BITSET_WORDS(bits)]
>
>   /* bitset operations
>

With it

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>