From 5f40fc042be6499caf29f4da629fe7cb5ea1cac3 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sat, 1 Aug 2020 08:45:13 -0700 Subject: Windows platform: fixed ARM compilation issue --- Platforms/Win32/interface/Win32PlatformMisc.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Platforms/Win32/interface/Win32PlatformMisc.hpp b/Platforms/Win32/interface/Win32PlatformMisc.hpp index c3e27865..f972e360 100644 --- a/Platforms/Win32/interface/Win32PlatformMisc.hpp +++ b/Platforms/Win32/interface/Win32PlatformMisc.hpp @@ -108,14 +108,20 @@ struct WindowsMisc : public BasicPlatformMisc inline static Diligent::Uint32 CountOneBits(Diligent::Uint32 Val) { +#if _M_ARM + auto Bits = _CountOneBits(Val); +#else auto Bits = __popcnt(Val); +#endif VERIFY_EXPR(Bits == BasicPlatformMisc::CountOneBits(Val)); return Bits; } inline static Diligent::Uint32 CountOneBits(Diligent::Uint64 Val) { -#if _WIN64 +#if _M_ARM + auto Bits = _CountOneBits64(Val); +#elif _WIN64 auto Bits = __popcnt64(Val); #else auto Bits = -- cgit v1.2.3