From 0786e4f903025debc19746a6f40ed9815235609d Mon Sep 17 00:00:00 2001
From: Craig Stout <cstout@google.com>
Date: Thu, 2 May 2019 19:06:28 +0000
Subject: [PATCH] [vulkan] Make test_swapchain more robust
Change-Id: I976512b86067fe7e473248451ec0f53b0ded6813
---
.../lib/vulkan/tests/unit/test_swapchain.cc | 24 +++++++++++++++----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/garnet/lib/vulkan/tests/unit/test_swapchain.cc b/garnet/lib/vulkan/tests/unit/test_swapchain.cc
index 0d2b4e87f98..49a297d3a88 100644
--- a/garnet/lib/vulkan/tests/unit/test_swapchain.cc
+++ b/garnet/lib/vulkan/tests/unit/test_swapchain.cc
@@ -139,14 +139,21 @@ class TestSwapchain {
.ppEnabledExtensionNames = instance_ext.data(),
};
- if (VK_SUCCESS != vkCreateInstance(&inst_info, nullptr, &vk_instance_))
+ VkResult result;
+ result = vkCreateInstance(&inst_info, nullptr, &vk_instance_);
+ if (result != VK_SUCCESS) {
+ fprintf(stderr, "vkCreateInstance failed: %d\n", result);
return;
+ }
uint32_t gpu_count = 1;
std::vector<VkPhysicalDevice> physical_devices(gpu_count);
- if (VK_SUCCESS != vkEnumeratePhysicalDevices(vk_instance_, &gpu_count,
- physical_devices.data()))
+ result = vkEnumeratePhysicalDevices(vk_instance_, &gpu_count,
+ physical_devices.data());
+ if (result != VK_SUCCESS && result != VK_INCOMPLETE) {
+ fprintf(stderr, "vkEnumeratePhysicalDevices failed: %d\n", result);
return;
+ }
float queue_priorities[1] = {0.0};
VkDeviceQueueCreateInfo queue_create_info = {
@@ -168,9 +175,12 @@ class TestSwapchain {
.ppEnabledExtensionNames = device_ext.data(),
.pEnabledFeatures = nullptr};
- if (VK_SUCCESS != vkCreateDevice(physical_devices[0], &device_create_info,
- nullptr, &vk_device_))
+ result = vkCreateDevice(physical_devices[0], &device_create_info, nullptr,
+ &vk_device_);
+ if (result != VK_SUCCESS) {
+ fprintf(stderr, "vkCreateDevice failed: %d\n", result);
return;
+ }
PFN_vkGetDeviceProcAddr get_device_proc_addr =
reinterpret_cast<PFN_vkGetDeviceProcAddr>(
@@ -217,6 +227,8 @@ class TestSwapchain {
}
void Surface() {
+ ASSERT_TRUE(init_);
+
zx::channel endpoint0, endpoint1;
EXPECT_EQ(ZX_OK, zx::channel::create(0, &endpoint0, &endpoint1));
@@ -232,6 +244,8 @@ class TestSwapchain {
}
void CreateSwapchain() {
+ ASSERT_TRUE(init_);
+
zx::channel endpoint0, endpoint1;
EXPECT_EQ(ZX_OK, zx::channel::create(0, &endpoint0, &endpoint1));
--
GitLab