lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-25 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call CreateWindowingData on the main UI thread

Browse Source 
* This allows mac to patch-up the widget to be renderable, and has to happen on
  the UI thread.
This commit is contained in:
baldurk
2018-08-31 22:14:12 +01:00
parent 01fb937e28
commit 5406227152
7 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/CaptureContext.cpp
+11 -9
View File
@@ -1197,23 +1197,25 @@ int CaptureContext::ResourceNameCacheID()
return m_CustomNameCachedID;
}
WindowingData CaptureContext::CreateWindowingData(uintptr_t widget)
#if defined(RENDERDOC_PLATFORM_APPLE)
extern "C" void makeNSViewMetalCompatible(void *handle);
#endif
WindowingData CaptureContext::CreateWindowingData(QWidget *window)
{
if(!GUIInvoke::onUIThread())
qCritical() << "CreateWindowingData called on non-UI thread";
#if defined(WIN32)
return CreateWin32WindowingData((HWND)widget);
return CreateWin32WindowingData((HWND)window->winId());
#elif defined(RENDERDOC_PLATFORM_LINUX)
if(m_CurWinSystem == WindowingSystem::XCB)
return CreateXCBWindowingData(m_XCBConnection, (xcb_window_t)widget);
return CreateXCBWindowingData(m_XCBConnection, (xcb_window_t)window->winId());
else
return CreateXlibWindowingData(m_X11Display, (Drawable)widget);
#elif defined(RENDERDOC_PLATFORM_APPLE)
WindowingData ret = {WindowingSystem::Unknown};
return ret;
return CreateXlibWindowingData(m_X11Display, (Drawable)window->winId());
#else