From e5d59289da7efb163875df09c36285bac02e33cd Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 18 Aug 2016 18:30:12 +0200 Subject: [PATCH] Minor code formatting tweak, and expand details of comment for future --- renderdoc/core/core.cpp | 5 ++++- renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/renderdoc/core/core.cpp b/renderdoc/core/core.cpp index e1ed7def7..b05fd3ed0 100644 --- a/renderdoc/core/core.cpp +++ b/renderdoc/core/core.cpp @@ -319,7 +319,10 @@ RenderDoc::~RenderDoc() if(m_RemoteThread) { m_RemoteServerThreadShutdown = true; - // don't join, just close the thread, as we can't wait while in the middle of module unloading + // On windows we can't join to this thread as it could lead to deadlocks, since we're + // performing this destructor in the middle of module unloading. However we want to + // ensure that the thread gets properly tidied up and closes its socket, so wait a little + // while to give it time to notice the shutdown signal and close itself. Threading::Sleep(50); Threading::CloseThread(m_RemoteThread); m_RemoteThread = 0; diff --git a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp index 483241c04..ac2c88042 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_wsi_funcs.cpp @@ -620,7 +620,9 @@ VkResult WrappedVulkan::vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR else { if(RenderDoc::Inst().IsRemoteAccessConnected()) + { overlayText += "Connected by " + RenderDoc::Inst().GetRemoteAccessUsername() + "."; + } else { uint32_t port = RenderDoc::Inst().GetRemoteAccessIdent();