mirror of
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
synced 2024-11-30 02:04:35 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
cad2acc080
@ -3080,7 +3080,7 @@ static inline uint32_t VmaCountBitsSet(uint32_t v)
|
|||||||
|
|
||||||
static inline uint8_t VmaBitScanLSB(uint64_t mask)
|
static inline uint8_t VmaBitScanLSB(uint64_t mask)
|
||||||
{
|
{
|
||||||
#ifdef _MSC_VER
|
#if defined(_MSC_VER) && defined(_WIN64)
|
||||||
unsigned long pos;
|
unsigned long pos;
|
||||||
if (_BitScanForward64(&pos, mask))
|
if (_BitScanForward64(&pos, mask))
|
||||||
return static_cast<uint8_t>(pos);
|
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)
|
static inline uint8_t VmaBitScanMSB(uint64_t mask)
|
||||||
{
|
{
|
||||||
#ifdef _MSC_VER
|
#if defined(_MSC_VER) && defined(_WIN64)
|
||||||
unsigned long pos;
|
unsigned long pos;
|
||||||
if (_BitScanReverse64(&pos, mask))
|
if (_BitScanReverse64(&pos, mask))
|
||||||
return static_cast<uint8_t>(pos);
|
return static_cast<uint8_t>(pos);
|
||||||
|
Loading…
Reference in New Issue
Block a user