From 07a6db9fbabf6e86deb9718696a97171441da3d0 Mon Sep 17 00:00:00 2001
From: Bryan Bernhart <bryan.bernhart@intel.com>
Date: Thu, 7 Jul 2022 21:35:14 -0700
Subject: [PATCH] Fix MSVC conversion warnings.

---
 src/tests/VKTest.cpp                          |  2 +-
 .../end2end/D3D12ResourceAllocatorTests.cpp   | 33 ++++++++++---------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/tests/VKTest.cpp b/src/tests/VKTest.cpp
index b003d6029..269599144 100644
--- a/src/tests/VKTest.cpp
+++ b/src/tests/VKTest.cpp
@@ -64,7 +64,7 @@ namespace gpgmm::vk {
             mPhysicalDevice = physicalDevices[0];
         }
 
-        ASSERT_NE(mPhysicalDevice, VK_NULL_HANDLE);
+        ASSERT_FALSE(mPhysicalDevice == VK_NULL_HANDLE);
 
         // Setup a single (universal) queue.
         uint32_t queueFamilyIndex = 0;
diff --git a/src/tests/end2end/D3D12ResourceAllocatorTests.cpp b/src/tests/end2end/D3D12ResourceAllocatorTests.cpp
index 7984555df..10162bf37 100644
--- a/src/tests/end2end/D3D12ResourceAllocatorTests.cpp
+++ b/src/tests/end2end/D3D12ResourceAllocatorTests.cpp
@@ -29,24 +29,24 @@ static constexpr uint64_t kDefaultBufferSize = 4ll * 1024ll * 1024ll;  // 4MB
 
 #define GPGMM_GET_VAR_NAME(x) (#x)
 
-#define EXPECT_SIZE_CACHE_HIT(allocator, statement)              \
-    do {                                                         \
-        ASSERT_NE(allocator, nullptr);                           \
-        size_t countBefore = allocator->GetInfo().SizeCacheHits; \
-        EXPECT_SUCCEEDED(statement);                             \
-        size_t countAfter = allocator->GetInfo().SizeCacheHits;  \
-        EXPECT_GT(countAfter, countBefore);                      \
-    } while (0)
-
-#define EXPECT_SIZE_CACHE_MISS(allocator, statement)               \
+#define EXPECT_SIZE_CACHE_HIT(allocator, statement)                \
     do {                                                           \
         ASSERT_NE(allocator, nullptr);                             \
-        size_t countBefore = allocator->GetInfo().SizeCacheMisses; \
+        uint64_t countBefore = allocator->GetInfo().SizeCacheHits; \
         EXPECT_SUCCEEDED(statement);                               \
-        size_t countAfter = allocator->GetInfo().SizeCacheMisses;  \
+        uint64_t countAfter = allocator->GetInfo().SizeCacheHits;  \
         EXPECT_GT(countAfter, countBefore);                        \
     } while (0)
 
+#define EXPECT_SIZE_CACHE_MISS(allocator, statement)                 \
+    do {                                                             \
+        ASSERT_NE(allocator, nullptr);                               \
+        uint64_t countBefore = allocator->GetInfo().SizeCacheMisses; \
+        EXPECT_SUCCEEDED(statement);                                 \
+        uint64_t countAfter = allocator->GetInfo().SizeCacheMisses;  \
+        EXPECT_GT(countAfter, countBefore);                          \
+    } while (0)
+
 class D3D12ResourceAllocatorTests : public D3D12TestBase, public ::testing::Test {
   protected:
     void SetUp() override {
@@ -674,19 +674,19 @@ TEST_F(D3D12ResourceAllocatorTests, CreateBufferWithinMany) {
     ASSERT_FAILED(smallBufferC->Map(/*subresource*/ 1));
 
     // Fill small buffer C with value 0xCC.
-    std::vector<uint8_t> dataCC(smallBufferC->GetSize(), 0xCC);
+    std::vector<uint8_t> dataCC(static_cast<const size_t>(smallBufferC->GetSize()), 0xCC);
     void* mappedBufferC = nullptr;
     ASSERT_SUCCEEDED(smallBufferC->Map(0, nullptr, &mappedBufferC));
     memcpy(mappedBufferC, dataCC.data(), dataCC.size());
 
     // Fill small buffer A with value 0xAA.
-    std::vector<uint8_t> dataAA(smallBufferA->GetSize(), 0xAA);
+    std::vector<uint8_t> dataAA(static_cast<const size_t>(smallBufferA->GetSize()), 0xAA);
     void* mappedBufferA = nullptr;
     ASSERT_SUCCEEDED(smallBufferA->Map(0, nullptr, &mappedBufferA));
     memcpy(mappedBufferA, dataAA.data(), dataAA.size());
 
     // Fill small buffer B with value 0xBB.
-    std::vector<uint8_t> dataBB(smallBufferB->GetSize(), 0xBB);
+    std::vector<uint8_t> dataBB(static_cast<const size_t>(smallBufferB->GetSize()), 0xBB);
     void* mappedBufferB = nullptr;
     ASSERT_SUCCEEDED(smallBufferB->Map(0, nullptr, &mappedBufferB));
     memcpy(mappedBufferB, dataBB.data(), dataBB.size());
@@ -1246,7 +1246,8 @@ TEST_F(D3D12ResourceAllocatorTests, CreateBufferCacheSize) {
         EXPECT_SIZE_CACHE_MISS(resourceAllocator,
                                resourceAllocator->CreateResource(
                                    smallResourceAllocDesc,
-                                   CreateBasicBufferDesc(D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT),
+                                   CreateBasicBufferDesc(static_cast<uint64_t>(
+                                       D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT)),
                                    D3D12_RESOURCE_STATE_GENERIC_READ, nullptr, &allocation));
         ASSERT_NE(allocation, nullptr);
         EXPECT_EQ(allocation->GetSize(),