diff options
| author | Ian Romanick <[email protected]> | 2017-11-13 11:17:41 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2018-03-29 14:09:23 -0700 |
| commit | d76c204d0564701b4b8b6a2bdda50e2939683e66 (patch) | |
| tree | edcf51df711640ffd89326079f10b1dcf65f311b /src/gallium/auxiliary/util | |
| parent | a3a16d4aa7e5a22816226d8e7417138164b10525 (diff) | |
util: Move util_is_power_of_two to bitscan.h and rename to util_is_power_of_two_or_zero
The new name make the zero-input behavior more obvious. The next
patch adds a new function with different zero-input behavior.
Signed-off-by: Ian Romanick <[email protected]>
Suggested-by: Matt Turner <[email protected]>
Reviewed-by: Alejandro Piñeiro <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/util')
| -rw-r--r-- | src/gallium/auxiliary/util/u_math.h | 10 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_ringbuffer.c | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index a441b5457b2..46d02978fd6 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -179,14 +179,6 @@ util_fast_pow(float x, float y) return util_fast_exp2(util_fast_log2(x) * y); } -/* Note that this counts zero as a power of two. - */ -static inline boolean -util_is_power_of_two( unsigned v ) -{ - return (v & (v-1)) == 0; -} - /** * Floor(x), returned as int. @@ -459,7 +451,7 @@ util_next_power_of_two(unsigned x) if (x <= 1) return 1; - if (util_is_power_of_two(x)) + if (util_is_power_of_two_or_zero(x)) return x; val--; diff --git a/src/gallium/auxiliary/util/u_ringbuffer.c b/src/gallium/auxiliary/util/u_ringbuffer.c index 4d6166833e4..f6bb910671e 100644 --- a/src/gallium/auxiliary/util/u_ringbuffer.c +++ b/src/gallium/auxiliary/util/u_ringbuffer.c @@ -27,7 +27,7 @@ struct util_ringbuffer *util_ringbuffer_create( unsigned dwords ) if (!ring) return NULL; - assert(util_is_power_of_two(dwords)); + assert(util_is_power_of_two_or_zero(dwords)); ring->buf = MALLOC( dwords * sizeof(unsigned) ); if (ring->buf == NULL) |