From 515bbd28fc17964733ca027537074bd9789a2115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Sun, 1 Sep 2019 15:39:33 +0200
Subject: [PATCH] VulkanMaybeAvailable: Bail earlier in some cases where
 there's no surface extension.

---
 Common/Vulkan/VulkanLoader.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Common/Vulkan/VulkanLoader.cpp b/Common/Vulkan/VulkanLoader.cpp
index 4f4c25feb0..5b0d0eb34c 100644
--- a/Common/Vulkan/VulkanLoader.cpp
+++ b/Common/Vulkan/VulkanLoader.cpp
@@ -334,7 +334,9 @@ bool VulkanMayBeAvailable() {
 		ELOG("Enumerating VK extensions failed.");
 		goto bail;
 	}
-
+	for (auto &ext: instanceExts) {
+		ILOG("  %s", ext.extensionName);
+	}
 	if (platformSurfaceExtension) {
 		for (auto iter : instanceExts) {
 			ILOG("VulkanMaybeAvailable: Instance extension found: %s (%08x)", iter.extensionName, iter.specVersion);
@@ -352,6 +354,11 @@ bool VulkanMayBeAvailable() {
 			ELOG("Platform surface extension not found");
 			goto bail;
 		}
+	} else {
+		if (!surfaceExtensionFound) {
+			ELOG("Surface extension not found");
+			goto bail;
+		}
 	}
 	// This can't happen unless the driver is double-reporting a surface extension.
 	if (ci.enabledExtensionCount > 2) {