commit 1684adba09b88c68368c507038099018eb359f88
author Cody Northrop <cody@lunarg.com> Wed Aug 05 11:15:02 2015 -0600
committer Tony Barbour <tony@LunarG.com> Thu Aug 06 15:40:28 2015 -0600
tree 934b417b635d1def29a9eb4c3a35491c1b8e590d
parent 855f4e519d76ad3278506ade923879f7243cc9c8

windows: Fix various warnings

Categories include:
 ASSERT_TRUE(int) changed to ASSERT_TRUE(0 != int)
 Change uint32_t to DeviceSize
 Stop adding with bools
 Add some explicit casting
 Remove unreferenced variables
 Add 'f' suffix to float literals

Conflicts:
	tests/vkrenderframework.cpp

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 023e41b..c7b233f 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -675,24 +675,24 @@
     vk_testing::Buffer src, dst;
     VkMemoryPropertyFlags reqs = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
 
-    src.init_as_src(dev_, size, reqs);
-    uint32_t *data = static_cast<uint32_t *>(src.memory().map());
+    src.init_as_src(dev_, size * sizeof(VkDeviceSize), reqs);
+    VkDeviceSize *data = static_cast<VkDeviceSize *>(src.memory().map());
     VkDeviceSize offset;
     for (offset = 0; offset < size; offset += 4)
         data[offset / 4] = offset;
     src.memory().unmap();
 
-    dst.init_as_dst(dev_, size, reqs);
+    dst.init_as_dst(dev_, size * sizeof(VkDeviceSize), reqs);
 
     cmd_.begin();
     VkBufferCopy region = {};
-    region.copySize = size;
+    region.copySize = size * sizeof(VkDeviceSize);
     vkCmdCopyBuffer(cmd_.handle(), src.handle(), dst.handle(), 1, &region);
     cmd_.end();
 
     submit_and_done();
 
-    data = static_cast<uint32_t *>(dst.memory().map());
+    data = static_cast<VkDeviceSize *>(dst.memory().map());
     for (offset = 0; offset < size; offset += 4)
         EXPECT_EQ(offset, data[offset / 4]);
     dst.memory().unmap();