commit 93ecb1d60c63a2b89ef0ca52d13bf263933bf100
author Mark Young <marky@lunarg.com> Wed Jan 13 13:47:16 2016 -0700
committer Mark Young <marky@lunarg.com> Mon Jan 25 11:01:48 2016 -0700
tree e4731208d82dc114ec0fe956033d89ddc567b935
parent e7da837c754c8760022814b8b617b883a8bf01ea

Win32: Get 32-bit Windows build working
Also includes changes to allow simultaneous 32-bit and 64-bit Windows builds.

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 12d8dfd..c723d19 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -92,7 +92,7 @@
 
     virtual void SetUp() {
         VkResult err;
-        int i;
+        size_t i;
 
         this->app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
         this->app_info.pNext = NULL;
@@ -127,7 +127,7 @@
         queue_props = this->m_device->phy().queue_properties();
         for (i = 0; i < queue_props.size(); i++) {
             if (queue_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
-                graphics_queue_node_index = i;
+                graphics_queue_node_index = (uint32_t)i;
                 break;
             }
         }
@@ -163,7 +163,7 @@
     err = vkMapMemory(device(), gpu_mem, 0, VK_WHOLE_SIZE, 0, (void **) &pData);
     ASSERT_VK_SUCCESS(err);
 
-    memset(pData, 0x55, alloc_info.allocationSize);
+    memset(pData, 0x55, (size_t)alloc_info.allocationSize);
     EXPECT_EQ(0x55, pData[0]) << "Memory read not same as write";
 
     vkUnmapMemory(device(), gpu_mem);