From dae20de48af9f87cf94e349977e4158a7435acd9 Mon Sep 17 00:00:00 2001 From: Bill Hollings Date: Tue, 23 Apr 2024 16:42:34 -0400 Subject: [PATCH] Update MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm Make fallback screen names consistent. --- MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm index cea69a4b..855b7986 100644 --- a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm +++ b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm @@ -615,14 +615,12 @@ void MVKSwapchain::initSurfaceImages(const VkSwapchainCreateInfoKHR* pCreateInfo if (mtlLayer) { NSString* screenName = @"Main Screen"; #if MVK_MACOS && !MVK_MACCAT - // To prevent deadlocks, avoid dispatching to the main thread at the cost of a less informative log. - if (NSThread.currentThread.isMainThread) { + // To prevent deadlocks, avoid dispatching screenMVK to the main thread at the cost of a less informative log. + if (NSThread.isMainThread) { auto* screen = mtlLayer.screenMVK; if ([screen respondsToSelector:@selector(localizedName)]) { screenName = screen.localizedName; } - } else { - screenName = @"?"; } #endif MVKLogInfo("Created %d swapchain images with size (%d, %d) and contents scale %.1f in layer %s (%p) on screen %s.",