commit ea69815acb17958a3c6122eab8591a1e91b1bf1c
author Felix Dörre <felix@dogcraft.de> Sun Dec 09 19:48:03 2018 +0100
committer Lenny Komow <lenny@lunarg.com> Thu Dec 20 15:32:14 2018 -0700
tree 003e6767e7331bde9f937ad0aed647cbbaaa5329
parent a8ef9fcf55a8db81d6d0ed8e32885922e9a594e5

fmt: use formatting as suggested by CI

tests/layers/wrap_objects.cpp

diff --git a/tests/layers/wrap_objects.cpp b/tests/layers/wrap_objects.cpp
index a28726f..4cd0a77 100644
--- a/tests/layers/wrap_objects.cpp
+++ b/tests/layers/wrap_objects.cpp
@@ -170,7 +170,7 @@
     VkLayerDeviceCreateInfo *chain_info = get_chain_info(pCreateInfo, VK_LAYER_LINK_INFO);
     PFN_vkGetInstanceProcAddr fpGetInstanceProcAddr = chain_info->u.pLayerInfo->pfnNextGetInstanceProcAddr;
     PFN_vkGetDeviceProcAddr fpGetDeviceProcAddr = chain_info->u.pLayerInfo->pfnNextGetDeviceProcAddr;
-    PFN_vkCreateDevice fpCreateDevice = (PFN_vkCreateDevice) fpGetInstanceProcAddr(phys_dev->inst->obj, "vkCreateDevice");
+    PFN_vkCreateDevice fpCreateDevice = (PFN_vkCreateDevice)fpGetInstanceProcAddr(phys_dev->inst->obj, "vkCreateDevice");
     if (fpCreateDevice == NULL) {
         return VK_ERROR_INITIALIZATION_FAILED;
     }

tests/loader_validation_tests.cpp

diff --git a/tests/loader_validation_tests.cpp b/tests/loader_validation_tests.cpp
index 906a986..e54c488 100644
--- a/tests/loader_validation_tests.cpp
+++ b/tests/loader_validation_tests.cpp
@@ -405,37 +405,35 @@
     }
 }
 
-void test_create_device(VkPhysicalDevice physical){
-  uint32_t familyCount = 0;
-  VkResult result;
-  vkGetPhysicalDeviceQueueFamilyProperties(physical, &familyCount, nullptr);
-  ASSERT_GT(familyCount, 0u);
+void test_create_device(VkPhysicalDevice physical) {
+    uint32_t familyCount = 0;
+    VkResult result;
+    vkGetPhysicalDeviceQueueFamilyProperties(physical, &familyCount, nullptr);
+    ASSERT_GT(familyCount, 0u);
 
-  std::unique_ptr<VkQueueFamilyProperties[]> family(new VkQueueFamilyProperties[familyCount]);
-  vkGetPhysicalDeviceQueueFamilyProperties(physical, &familyCount, family.get());
-  ASSERT_GT(familyCount, 0u);
+    std::unique_ptr<VkQueueFamilyProperties[]> family(new VkQueueFamilyProperties[familyCount]);
+    vkGetPhysicalDeviceQueueFamilyProperties(physical, &familyCount, family.get());
+    ASSERT_GT(familyCount, 0u);
 
-  for (uint32_t q = 0; q < familyCount; ++q) {
-    if (~family[q].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
-      continue;
+    for (uint32_t q = 0; q < familyCount; ++q) {
+        if (~family[q].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
+            continue;
+        }
+
+        float const priorities[] = {0.0f};  // Temporary required due to MSVC bug.
+        VkDeviceQueueCreateInfo const queueInfo[1]{
+            VK::DeviceQueueCreateInfo().queueFamilyIndex(q).queueCount(1).pQueuePriorities(priorities)};
+
+        auto const deviceInfo = VK::DeviceCreateInfo().queueCreateInfoCount(1).pQueueCreateInfos(queueInfo);
+
+        VkDevice device;
+        result = vkCreateDevice(physical, deviceInfo, nullptr, &device);
+        ASSERT_EQ(result, VK_SUCCESS);
+
+        vkDestroyDevice(device, nullptr);
     }
-
-    float const priorities[] = {0.0f};  // Temporary required due to MSVC bug.
-    VkDeviceQueueCreateInfo const queueInfo[1]{
-      VK::DeviceQueueCreateInfo().queueFamilyIndex(q).queueCount(1).pQueuePriorities(priorities)};
-
-    auto const deviceInfo = VK::DeviceCreateInfo().queueCreateInfoCount(1).pQueueCreateInfos(queueInfo);
-
-    VkDevice device;
-    result = vkCreateDevice(physical, deviceInfo, nullptr, &device);
-    ASSERT_EQ(result, VK_SUCCESS);
-
-    vkDestroyDevice(device, nullptr);
-  }
 }
 
-
-
 // Test groups:
 // LX = lunar exchange
 // LVLGH = loader and validation github
@@ -481,26 +479,26 @@
 TEST(CreateInstance, LayerPresent) {
     char const *const names1[] = {"VK_LAYER_LUNARG_test"};  // Temporary required due to MSVC bug.
     char const *const names2[] = {"VK_LAYER_LUNARG_meta"};  // Temporary required due to MSVC bug.
-    char const *const names3[] = {"VK_LAYER_LUNARG_meta_rev"}; // Temporary required due to MSVC bug.
+    char const *const names3[] = {"VK_LAYER_LUNARG_meta_rev"};  // Temporary required due to MSVC bug.
     auto const info1 = VK::InstanceCreateInfo().enabledLayerCount(1).ppEnabledLayerNames(names1);
     VkInstance instance = VK_NULL_HANDLE;
     VkResult result = vkCreateInstance(info1, VK_NULL_HANDLE, &instance);
     ASSERT_EQ(result, VK_SUCCESS);
     vkDestroyInstance(instance, nullptr);
 
-    for(auto names : {names2, names3}){
-      auto const info2 = VK::InstanceCreateInfo().enabledLayerCount(1).ppEnabledLayerNames(names);
-      instance = VK_NULL_HANDLE;
-      result = vkCreateInstance(info2, VK_NULL_HANDLE, &instance);
-      ASSERT_EQ(result, VK_SUCCESS);
+    for (auto names : {names2, names3}) {
+        auto const info2 = VK::InstanceCreateInfo().enabledLayerCount(1).ppEnabledLayerNames(names);
+        instance = VK_NULL_HANDLE;
+        result = vkCreateInstance(info2, VK_NULL_HANDLE, &instance);
+        ASSERT_EQ(result, VK_SUCCESS);
 
-      uint32_t deviceCount;
-      vkEnumeratePhysicalDevices(instance, &deviceCount, nullptr);
-      std::vector<VkPhysicalDevice> devs(deviceCount);
-      vkEnumeratePhysicalDevices(instance, &deviceCount, devs.data());
-      test_create_device(devs[0]);
+        uint32_t deviceCount;
+        vkEnumeratePhysicalDevices(instance, &deviceCount, nullptr);
+        std::vector<VkPhysicalDevice> devs(deviceCount);
+        vkEnumeratePhysicalDevices(instance, &deviceCount, devs.data());
+        test_create_device(devs[0]);
 
-      vkDestroyInstance(instance, nullptr);
+        vkDestroyInstance(instance, nullptr);
     }
 }
 
@@ -1039,7 +1037,7 @@
     ASSERT_GT(physicalCount, 0u);
 
     for (uint32_t p = 0; p < physicalCount; ++p) {
-      test_create_device(physical[p]);
+        test_create_device(physical[p]);
     }
 
     vkDestroyInstance(instance, nullptr);