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

Matt Turner mattst88 at gmail.com
Wed Feb 11 16:59:35 PST 2015


On Wed, Feb 11, 2015 at 4:48 PM, Eric Anholt <eric at anholt.net> 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)

I don't think I realized BITSET_WORD was 32-bit on amd64. I had an
apparently false memory of you changing this to a 64-bit type and
getting a bit speed up on orbital explorer's gs compilation (commit
415d6dc5).

Maybe as a follow on patch, what do you think about using
uint_fast32_t (which is 64-bit on amd64) for BITSET_WORD? Of course
MSVC probably doesn't support that either.


More information about the mesa-dev mailing list