Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-01-28 06:28:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

vrclient_x64: Set explicit timing mode when d3d11 application uses PostPresentHandoff.

Browse Source
This commit is contained in:
Paul Gofman 2021-02-03 15:25:20 +03:00 committed by Andrew Eikum
parent 66ded86b3e
commit 4f51390dde
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -54,6 +54,7 @@ static struct
#ifdef VRCLIENT_HAVE_DXVK #ifdef VRCLIENT_HAVE_DXVK
IDXGIVkInteropDevice *dxvk_device; IDXGIVkInteropDevice *dxvk_device;
#endif #endif
BOOL d3d11_explicit_handoff, handoff_called;
} }
compositor_data; compositor_data;
@ -1074,6 +1075,8 @@ EVRCompositorError ivrcompositor_submit(
TRACE("%p, %#x, %p, %p, %#x\n", linux_side, eye, texture, bounds, flags); TRACE("%p, %#x, %p, %p, %#x\n", linux_side, eye, texture, bounds, flags);
compositor_data.handoff_called = FALSE;
switch (texture->eType) switch (texture->eType)
{ {
case TextureType_DirectX: case TextureType_DirectX:
@ -1268,11 +1271,24 @@ void ivrcompositor_post_present_handoff(void (*cpp_func)(void *),
#ifdef VRCLIENT_HAVE_DXVK #ifdef VRCLIENT_HAVE_DXVK
if (compositor_data.dxvk_device) if (compositor_data.dxvk_device)
{
compositor_data.dxvk_device->lpVtbl->LockSubmissionQueue(compositor_data.dxvk_device); compositor_data.dxvk_device->lpVtbl->LockSubmissionQueue(compositor_data.dxvk_device);
if (!compositor_data.d3d11_explicit_handoff && version >= 21)
{
/* PostPresentHandoff can be used with d3d11 without SetExplicitTimingMode
* (which is Vulkan / d3d12 only), but doing the same with Vulkan results
* in lockups and crashes. */
cppIVRCompositor_IVRCompositor_021_SetExplicitTimingMode(linux_side,
VRCompositorTimingMode_Explicit_ApplicationPerformsPostPresentHandoff);
compositor_data.d3d11_explicit_handoff = TRUE;
}
}
#endif #endif
cpp_func(linux_side); cpp_func(linux_side);
compositor_data.handoff_called = TRUE;
#ifdef VRCLIENT_HAVE_DXVK #ifdef VRCLIENT_HAVE_DXVK
if (compositor_data.dxvk_device) if (compositor_data.dxvk_device)
compositor_data.dxvk_device->lpVtbl->ReleaseSubmissionQueue(compositor_data.dxvk_device); compositor_data.dxvk_device->lpVtbl->ReleaseSubmissionQueue(compositor_data.dxvk_device);
@ -1323,14 +1339,27 @@ EVRCompositorError ivrcompositor_wait_get_poses(
#ifdef VRCLIENT_HAVE_DXVK #ifdef VRCLIENT_HAVE_DXVK
if (compositor_data.dxvk_device) if (compositor_data.dxvk_device)
{
compositor_data.dxvk_device->lpVtbl->LockSubmissionQueue(compositor_data.dxvk_device); compositor_data.dxvk_device->lpVtbl->LockSubmissionQueue(compositor_data.dxvk_device);
if (compositor_data.d3d11_explicit_handoff && !compositor_data.handoff_called)
{
/* Calling handoff after submit is optional for d3d11 but mandatory for Vulkan
* if explicit timing mode is set. */
cppIVRCompositor_IVRCompositor_022_PostPresentHandoff(linux_side);
}
}
#endif #endif
r = cpp_func(linux_side, render_poses, render_pose_count, game_poses, game_pose_count); r = cpp_func(linux_side, render_poses, render_pose_count, game_poses, game_pose_count);
#ifdef VRCLIENT_HAVE_DXVK #ifdef VRCLIENT_HAVE_DXVK
if (compositor_data.dxvk_device) if (compositor_data.dxvk_device)
{
if (compositor_data.d3d11_explicit_handoff)
cppIVRCompositor_IVRCompositor_022_SubmitExplicitTimingData(linux_side);
compositor_data.dxvk_device->lpVtbl->ReleaseSubmissionQueue(compositor_data.dxvk_device); compositor_data.dxvk_device->lpVtbl->ReleaseSubmissionQueue(compositor_data.dxvk_device);
}
#endif #endif
if ((wined3d_device = compositor_data.wined3d_device)) if ((wined3d_device = compositor_data.wined3d_device))