commit 37a43a64af08599b5fe5429c6c331f42f765fca9
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Oct 22 11:03:31 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 23 17:32:04 2015 -0600
tree 244f4902f77e5d2d49810abc96a52ad483d59280
parent 8e2f097c013646e6688ecd7041c6ebdd4372e5c2

bug-14542: Remove VK_UNSUPPORTED from success return codes

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 031f759..4b7cc95 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -141,6 +141,7 @@
 
 TEST_F(VkTest, AllocMemory) {
     VkResult err;
+    bool pass;
     VkMemoryAllocInfo alloc_info = {};
     VkDeviceMemory gpu_mem;
     uint8_t *pData;
@@ -152,8 +153,8 @@
     VkPhysicalDeviceMemoryProperties mem_props;
     vkGetPhysicalDeviceMemoryProperties(m_device->phy().handle(), &mem_props);
 
-    err = m_device->phy().set_memory_type(((1 << mem_props.memoryTypeCount) - 1), &alloc_info, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
-    ASSERT_VK_SUCCESS(err);
+    pass = m_device->phy().set_memory_type(((1 << mem_props.memoryTypeCount) - 1), &alloc_info, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
+    ASSERT_TRUE(pass);
 
     err = vkAllocMemory(device(), &alloc_info, &gpu_mem);
     ASSERT_VK_SUCCESS(err);
@@ -284,6 +285,7 @@
 void VkTest::CreateImageTest()
 {
     VkResult err;
+    bool pass;
     VkImage image;
     uint32_t w, h, mipCount;
     VkFormat fmt;
@@ -420,8 +422,8 @@
         mem_info.allocationSize = mem_req.size;
         mem_info.memoryTypeIndex = 0;
 
-        err = m_device->phy().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
-        ASSERT_VK_SUCCESS(err);
+        pass = m_device->phy().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
+        ASSERT_TRUE(pass);
 
         err = vkAllocMemory(device(), &mem_info, &image_mem);
         ASSERT_VK_SUCCESS(err);