diff options
| author | Paul Berry <stereotype441@gmail.com> | 2011-09-28 13:18:09 -0700 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2011-10-06 19:27:33 -0700 |
| commit | c163072197b56e76b656cc472bbe6df650cf11ba (patch) | |
| tree | f3d0a9d3d19e716058f7944d0270ca687b68dc41 /src/mesa/drivers/dri/i965/brw_util.h | |
| parent | 09fcd01301cd161e2a5d619933c14f79753108d6 (diff) | |
| download | external_mesa3d-c163072197b56e76b656cc472bbe6df650cf11ba.zip external_mesa3d-c163072197b56e76b656cc472bbe6df650cf11ba.tar.gz external_mesa3d-c163072197b56e76b656cc472bbe6df650cf11ba.tar.bz2 | |
mesa: Create _mesa_bitcount_64() to replace i965's brw_count_bits()
The i965 driver already had a function to count bits in a 64-bit uint
(brw_count_bits()), but it was buggy (it only counted the bottom 32
bits) and it was clumsy (it had a strange and broken fallback for
non-GCC-like compilers, which fortunately was never used). Since Mesa
already has a _mesa_bitcount() function, it seems better to just
create a _mesa_bitcount_64() function rather than special-case this in
the i965 driver.
This patch creates the new _mesa_bitcount_64() function and rewrites
all of the old brw_count_bits() calls to refer to it.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_util.h')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_util.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_util.h b/src/mesa/drivers/dri/i965/brw_util.h index 940a871..c0fc133 100644 --- a/src/mesa/drivers/dri/i965/brw_util.h +++ b/src/mesa/drivers/dri/i965/brw_util.h @@ -34,15 +34,8 @@ #define BRW_UTIL_H #include "main/mtypes.h" +#include "main/imports.h" -#ifdef __GNUC__ -#define brw_count_bits(v) __builtin_popcount(v) -#else -static inline GLuint brw_count_bits(uint64_t v) -{ - return _mesa_popcount(v>>32) + _mesa_popcount(v&0xffffffff); -} -#endif extern GLuint brw_parameter_list_state_flags(struct gl_program_parameter_list *paramList); extern GLuint brw_translate_blend_factor( GLenum factor ); extern GLuint brw_translate_blend_equation( GLenum mode ); |