Clean up glfwinfo Vulkan version output

This commit is contained in:
Camilla Löwy 2019-05-19 19:27:48 +02:00
parent 144c98bcb3
commit c415c71947

View File

@ -217,7 +217,7 @@ static void list_vulkan_instance_extensions(void)
vkEnumerateInstanceExtensionProperties(NULL, &ep_count, ep); vkEnumerateInstanceExtensionProperties(NULL, &ep_count, ep);
for (uint32_t i = 0; i < ep_count; i++) for (uint32_t i = 0; i < ep_count; i++)
printf(" %s (v%u)\n", ep[i].extensionName, ep[i].specVersion); printf(" %s (spec version %u)\n", ep[i].extensionName, ep[i].specVersion);
free(ep); free(ep);
} }
@ -233,7 +233,7 @@ static void list_vulkan_instance_layers(void)
for (uint32_t i = 0; i < lp_count; i++) for (uint32_t i = 0; i < lp_count; i++)
{ {
printf(" %s (v%u) \"%s\"\n", printf(" %s (spec version %u) \"%s\"\n",
lp[i].layerName, lp[i].layerName,
lp[i].specVersion >> 22, lp[i].specVersion >> 22,
lp[i].description); lp[i].description);
@ -252,7 +252,7 @@ static void list_vulkan_device_extensions(VkInstance instance, VkPhysicalDevice
vkEnumerateDeviceExtensionProperties(device, NULL, &ep_count, ep); vkEnumerateDeviceExtensionProperties(device, NULL, &ep_count, ep);
for (uint32_t i = 0; i < ep_count; i++) for (uint32_t i = 0; i < ep_count; i++)
printf(" %s (v%u)\n", ep[i].extensionName, ep[i].specVersion); printf(" %s (spec version %u)\n", ep[i].extensionName, ep[i].specVersion);
free(ep); free(ep);
} }
@ -268,7 +268,7 @@ static void list_vulkan_device_layers(VkInstance instance, VkPhysicalDevice devi
for (uint32_t i = 0; i < lp_count; i++) for (uint32_t i = 0; i < lp_count; i++)
{ {
printf(" %s (v%u) \"%s\"\n", printf(" %s (spec version %u) \"%s\"\n",
lp[i].layerName, lp[i].layerName,
lp[i].specVersion >> 22, lp[i].specVersion >> 22,
lp[i].description); lp[i].description);
@ -841,7 +841,7 @@ int main(int argc, char** argv)
vkGetPhysicalDeviceProperties(pd[i], &pdp); vkGetPhysicalDeviceProperties(pd[i], &pdp);
printf("Vulkan %s device: \"%s\" API version %i.%i\n", printf("Vulkan %s device: \"%s\" (API version %i.%i)\n",
get_device_type_name(pdp.deviceType), get_device_type_name(pdp.deviceType),
pdp.deviceName, pdp.deviceName,
VK_VERSION_MAJOR(pdp.apiVersion), VK_VERSION_MAJOR(pdp.apiVersion),