vulkaninfo: Fix merge conflicts in PR #98

Fixed some merge conflicts in PR #98 so that it
can be added to vulkaninfo

Change-Id: I24c7110ec77c8b9dabd371dd8435c3d25db24928

diff --git a/vulkaninfo/vulkaninfo.c b/vulkaninfo/vulkaninfo.c
index 1d302e6..a8de58f 100644 (file)
--- a/vulkaninfo/vulkaninfo.c
+++ b/vulkaninfo/vulkaninfo.c
@@ -127,6 +127,7 @@ struct AppInstance {
     const char **inst_extensions;
     uint32_t inst_extensions_count;
 
+    // Functions from vkGetInstanceProcAddress
     PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR;
     PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
     PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vkGetPhysicalDeviceSurfaceFormatsKHR;