diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-08 22:58:35 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-21 12:59:37 +0000 |
| commit | 41260a9bf63aa61f88f188053f1ed4dba3a852d2 (patch) | |
| tree | 59aef62f5130eff6daf83ba75550af7bb78c7289 /src/mesa/main | |
| parent | 8ea6e98c7be6483514769b03ffa6c6f4f7b2e0be (diff) | |
i965: Use compiler builtins when available
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/imports.c | 13 | ||||
| -rw-r--r-- | src/mesa/main/imports.h | 13 |
2 files changed, 17 insertions, 9 deletions
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index fef46c4bbf..bf89815f2d 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -453,6 +453,7 @@ _mesa_inv_sqrtf(float n) #endif } +#ifndef __GNUC__ /** * Find the first bit set in a word. */ @@ -496,9 +497,6 @@ _mesa_ffs(int32_t i) int _mesa_ffsll(int64_t val) { -#ifdef ffsll - return ffsll(val); -#else int bit; assert(sizeof(val) == 8); @@ -512,27 +510,24 @@ _mesa_ffsll(int64_t val) return 32 + bit; return 0; -#endif } +#if ((_GNUC__ == 3 && __GNUC_MINOR__ < 4) || __GNUC__ < 4) /** * Return number of bits set in given GLuint. */ unsigned int _mesa_bitcount(unsigned int n) { -#if defined(__GNUC__) && \ - ((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4) - return __builtin_popcount(n); -#else unsigned int bits; for (bits = 0; n > 0; n = n >> 1) { bits += (n & 1); } return bits; -#endif } +#endif +#endif /** diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 5ea647ad8d..a994dbcae8 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -539,6 +539,18 @@ _mesa_inv_sqrtf(float x); extern void _mesa_init_sqrt_table(void); +#ifdef __GNUC__ +#define _mesa_ffs(i) ffs(i) +#define _mesa_ffsll(i) ffsll(i) + +#if ((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4) +#define _mesa_bitcount(i) __builtin_popcount(i) +#else +extern unsigned int +_mesa_bitcount(unsigned int n); +#endif + +#else extern int _mesa_ffs(int32_t i); @@ -547,6 +559,7 @@ _mesa_ffsll(int64_t i); extern unsigned int _mesa_bitcount(unsigned int n); +#endif extern GLhalfARB _mesa_float_to_half(float f); |