Merge remote-tracking branch 'origin/master'

This commit is contained in:
Adam Sawicki 2022-01-24 14:59:22 +01:00
commit cad2acc080

View File

@ -3080,7 +3080,7 @@ static inline uint32_t VmaCountBitsSet(uint32_t v)
static inline uint8_t VmaBitScanLSB(uint64_t mask)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_WIN64)
unsigned long pos;
if (_BitScanForward64(&pos, mask))
return static_cast<uint8_t>(pos);
@ -3124,7 +3124,7 @@ static inline uint8_t VmaBitScanLSB(uint32_t mask)
static inline uint8_t VmaBitScanMSB(uint64_t mask)
{
#ifdef _MSC_VER
#if defined(_MSC_VER) && defined(_WIN64)
unsigned long pos;
if (_BitScanReverse64(&pos, mask))
return static_cast<uint8_t>(pos);