From 22970932d014f024fcf7f0f98b1a5384b1b1eb99 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Wed, 10 Jun 2020 14:21:03 +0200 Subject: [PATCH] d3dx9: Use BitScanReverse in make_pow2. Signed-off-by: Jacek Caban Signed-off-by: Matteo Bruni Signed-off-by: Alexandre Julliard --- dlls/d3dx9_36/d3dx9_private.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index d64b9af30c5..c3308b04d44 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -229,19 +229,8 @@ static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) /* Returns the smallest power of 2 which is greater than or equal to num */ static inline uint32_t make_pow2(uint32_t num) { -#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) - return num == 1 ? 1 : 1u << ((__builtin_clz(num - 1) ^ 0x1f) + 1); -#else - num--; - num |= num >> 1; - num |= num >> 2; - num |= num >> 4; - num |= num >> 8; - num |= num >> 16; - num++; - - return num; -#endif + uint32_t index; + return BitScanReverse(&index, num - 1) ? 1u << (index + 1) : 1; } struct d3dx_parameter;