commit 01d2ae18f05184e04eb29a2ab30480f8d4660d25
author Courtney Goeltzenleuchter <courtney@LunarG.com> Tue Oct 20 16:40:38 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 23 17:31:14 2015 -0600
tree 0e1737cc583d3ea229c0ef972f02ff25fa1b0596
parent 0ed02cf2dbeb42e2ff4fdf25583316f6850b72aa

Bug 14621: Change vkGet* functions to not return VkResult

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 0c058ea..70aa900 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -272,14 +272,12 @@
 void getQueue(vk_testing::Device *device, uint32_t queue_node_index, const char *qname)
 {
     uint32_t que_idx;
-    VkResult err;
     VkQueue queue;
 
     const VkQueueFamilyProperties props = device->phy().queue_properties()[queue_node_index];
     for (que_idx = 0; que_idx < props.queueCount; que_idx++) {
         // TODO: Need to add support for separate MEMMGR and work queues, including synchronization
-        err = vkGetDeviceQueue(device->handle(), queue_node_index, que_idx, &queue);
-        ASSERT_EQ(VK_SUCCESS, err) << "vkGetDeviceQueue: " << qname << " queue #" << que_idx << ": Failed with error: " << vk_result_string(err);
+        vkGetDeviceQueue(device->handle(), queue_node_index, que_idx, &queue);
     }
 }
 
@@ -315,8 +313,7 @@
      * fixed structure.
      */
 
-    err = vkGetPhysicalDeviceFormatProperties(objs[m_device_id], fmt, &image_fmt);
-    ASSERT_VK_SUCCESS(err);
+    vkGetPhysicalDeviceFormatProperties(objs[m_device_id], fmt, &image_fmt);
 
 //    typedef struct VkImageCreateInfo_
 //    {
@@ -364,7 +361,7 @@
     ASSERT_VK_SUCCESS(err);
 
     // Verify image resources
-//    VkResult VKAPI vkGetImageSubresourceLayout(
+//    void VKAPI vkGetImageSubresourceLayout(
 //        VkImage                                   image,
 //        const VkImageSubresource*                pSubresource,
 //        VkSubresourceLayout*                     pLayout);
@@ -394,8 +391,7 @@
         while ((_w > 0) || (_h > 0))
         {
             VkSubresourceLayout layout = {};
-            err = vkGetImageSubresourceLayout(device(), image, &subresource, &layout);
-            ASSERT_VK_SUCCESS(err);
+            vkGetImageSubresourceLayout(device(), image, &subresource, &layout);
 
             // TODO: 4 should be replaced with pixel size for given format
             EXPECT_LE(_w * 4, layout.rowPitch) << "Pitch does not match expected image pitch";
@@ -409,8 +405,7 @@
     VkMemoryRequirements mem_req;
     VkDeviceMemory image_mem;
 
-    err = vkGetImageMemoryRequirements(device(), image, &mem_req);
-    ASSERT_VK_SUCCESS(err);
+    vkGetImageMemoryRequirements(device(), image, &mem_req);
 
     if (mem_req.size) {