Fix window creation issue #13

src/device.cpp

@@ -1079,17 +1079,14 @@ VkResult doCreateDevice(
 	// init command hook
 	dev.commandHook = std::make_unique<CommandHook>(dev);
 
-	// == window stuff ==
 #ifdef VIL_WITH_SWA
 	if(window) {
-		dlg_assert(window->presentQueue); // should have been set in queue querying
+		dlg_assert(window->presentQueue);
 		dev.window = std::move(window);
 
 		if(standaloneMode) {
 			dev.window->dev = &dev;
 			dev.window->doInitSwapchain();
-		} else {
-			dev.window->initDevice(dev);
 		}
 	}
 #endif // VIL_WITH_SWA
@@ -1311,6 +1308,19 @@ VkFormat findDepthFormat(const Device& dev) {
 	return findSupported(dev, fmts, img, features);
 }
 
+// This delayed initialization is needed because we cannot
+// call vulkan functions (such as CreateSwapchain) inside window
+// creation, where we'd ideally initialize the window.
+// https://github.com/KhronosGroup/Vulkan-Loader/pull/1049 broke
+// this. We now have to make sure to make it later on.
+void checkInitWindow(Device& dev) {
+#ifdef VIL_WITH_SWA
+	if(dev.window && !dev.window->dev) {
+		dev.window->initDevice(dev);
+	}
+#endif // VIL_WITH_SWA
+}
+
 // NOTE: doesn't really belong here
 thread_local ThreadContext ThreadContext::instance;
 

src/device.hpp

@@ -295,6 +295,9 @@ struct Device {
 void notifyApiHandleDestroyedLocked(Device& dev, Handle& handle, VkObjectType type);
 void notifyMemoryResourceInvalidatedLocked(Device& dev, MemoryResource& res);
 
+// Lazily initializes the window, if needed.
+void checkInitWindow(Device& dev);
+
 // Util for naming internal handles.
 // Mainly useful to get better validation layer output for stuff
 // we do inside the layer. Should never be used on any non-internal

src/memory.cpp

@@ -157,6 +157,8 @@ VKAPI_ATTR VkResult VKAPI_CALL AllocateMemory(
 		VkDeviceMemory*                             pMemory) {
 	auto& dev = getDevice(device);
 
+	checkInitWindow(dev);
+
 	ThreadMemScope memScope;
 	auto chainCopy = copyChainLocal(memScope, pAllocateInfo->pNext);
 	auto allocInfo = *pAllocateInfo;

src/queue.cpp

@@ -11,7 +11,6 @@
 #include <buffer.hpp>
 #include <image.hpp>
 #include <submit.hpp>
-#include <deque>
 #include <gui/gui.hpp>
 #include <commandHook/submission.hpp>
 #include <util/util.hpp>
@@ -163,6 +162,8 @@ VkResult doSubmit(Queue& queue, span<const VkSubmitInfo2> submits,
 	ZoneScoped;
 	auto& dev = *queue.dev;
 
+	checkInitWindow(dev);
+
 	QueueSubmitter submitter {};
 	init(submitter, queue, SubmissionType::command, fence);