From 9434aa8103e93c9a80421b20f04b526ef543d46e Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Fri, 15 Apr 2016 22:08:57 +0200 Subject: gallium/util: fix u_bit_scan_consecutive_range for mask == 0xffffffff The second ffs returns 0, yielding count == -1. v2: change 1 to 1u Reviewed-by: Bas Nieuwenhuizen --- src/gallium/auxiliary/util/u_math.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/gallium/auxiliary/util') diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index b4ac0db3c50..0a829158b11 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -518,9 +518,15 @@ u_bit_scan64(uint64_t *mask) static inline void u_bit_scan_consecutive_range(unsigned *mask, int *start, int *count) { + if (*mask == 0xffffffff) { + *start = 0; + *count = 32; + *mask = 0; + return; + } *start = ffs(*mask) - 1; *count = ffs(~(*mask >> *start)) - 1; - *mask &= ~(((1 << *count) - 1) << *start); + *mask &= ~(((1u << *count) - 1) << *start); } /** -- cgit v1.2.3