Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 23:25:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

vrclient: Factor out ivrcompositor_submit_wined3d().

Browse Source
This commit is contained in:
Józef Kucia 2018-09-10 17:14:55 +02:00 committed by Andrew Eikum
parent 3f2b30d351
commit 66e149f87f
1 changed files with 90 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -500,16 +500,96 @@ static void *get_our_compositor(void)
return our_compositor; return our_compositor;
} }
static EVRCompositorError ivrcompositor_submit_wined3d(
EVRCompositorError (*cpp_func)(void *, EVREye, Texture_t *, VRTextureBounds_t *, EVRSubmitFlags),
void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags flags,
unsigned int version, struct compositor_data *user_data, IWineD3D11Texture2D *wine_texture)
{
IWineD3D11Device *wined3d_device;
struct submit_data submit_data;
IUnknown *depth_texture = NULL;
ID3D11Device *device;
HRESULT hr;
wine_texture->lpVtbl->GetDevice(wine_texture, &device);
if (user_data->d3d11_device != device)
{
void *timing_compositor = linux_side;
if (user_data->d3d11_device)
FIXME("Previous submit was from different D3D11 device.\n");
user_data->d3d11_device = device;
if (SUCCEEDED(hr = device->lpVtbl->QueryInterface(device,
&IID_IWineD3D11Device, (void **)&wined3d_device)))
{
user_data->wined3d_device = wined3d_device;
wined3d_device->lpVtbl->Release(wined3d_device);
}
else
{
ERR("Failed to get device, hr %#x.\n", hr);
user_data->wined3d_device = NULL;
}
TRACE("Enabling explicit timing mode.\n");
switch (version)
{
/* older, supported versions */
case 21:
cppIVRCompositor_IVRCompositor_021_SetExplicitTimingMode(linux_side,
VRCompositorTimingMode_Explicit_ApplicationPerformsPostPresentHandoff);
break;
default:
timing_compositor = get_our_compositor();
WARN("Performing our compositor hack for old compositor version %u.\n", version);
/* fall through, below version MUST match version in create_our_compositor() */
case 22:
cppIVRCompositor_IVRCompositor_022_SetExplicitTimingMode(timing_compositor,
VRCompositorTimingMode_Explicit_ApplicationPerformsPostPresentHandoff);
break;
}
}
device->lpVtbl->Release(device);
submit_data.linux_side = linux_side;
submit_data.submit = cpp_func;
submit_data.eye = eye;
switch (flags & (Submit_TextureWithPose | Submit_TextureWithDepth))
{
case 0:
submit_data.texture = *texture;
break;
case Submit_TextureWithPose:
submit_data.texture_pose = *(VRTextureWithPose_t *)texture;
break;
case Submit_TextureWithDepth:
submit_data.texture_depth = *(VRTextureWithDepth_t *)texture;
depth_texture = (IUnknown *)submit_data.texture_depth.depth.handle;
break;
case Submit_TextureWithPose | Submit_TextureWithDepth:
submit_data.texture_both = *(VRTextureWithPoseAndDepth_t *)texture;
depth_texture = (IUnknown *)submit_data.texture_both.depth.handle;
break;
}
submit_data.bounds = *bounds;
submit_data.flags = flags;
wine_texture->lpVtbl->access_gl_texture(wine_texture,
d3d11_texture_callback, depth_texture, &submit_data, sizeof(submit_data));
wine_texture->lpVtbl->Release(wine_texture);
return 0;
}
EVRCompositorError ivrcompositor_submit( EVRCompositorError ivrcompositor_submit(
EVRCompositorError (*cpp_func)(void *, EVREye, Texture_t *, VRTextureBounds_t *, EVRSubmitFlags), EVRCompositorError (*cpp_func)(void *, EVREye, Texture_t *, VRTextureBounds_t *, EVRSubmitFlags),
void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags flags, void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags flags,
unsigned int version, struct compositor_data *user_data) unsigned int version, struct compositor_data *user_data)
{ {
IWineD3D11Texture2D *wine_texture; IWineD3D11Texture2D *wine_texture;
IWineD3D11Device *wined3d_device; IUnknown *texture_iface;
struct submit_data submit_data;
IUnknown *texture_iface, *depth_texture = NULL;
ID3D11Device *device;
HRESULT hr; HRESULT hr;
#if !defined(__APPLE__) || defined(__x86_64__) #if !defined(__APPLE__) || defined(__x86_64__)
IDXGIVkInteropSurface *dxvk_surface; IDXGIVkInteropSurface *dxvk_surface;
@ -525,79 +605,12 @@ EVRCompositorError ivrcompositor_submit(
TRACE("D3D11\n"); TRACE("D3D11\n");
texture_iface = texture->handle; texture_iface = texture->handle;
hr = texture_iface->lpVtbl->QueryInterface(texture_iface,
&IID_IWineD3D11Texture2D, (void **)&wine_texture);
if (SUCCEEDED(hr)) {
wine_texture->lpVtbl->GetDevice(wine_texture, &device); if (SUCCEEDED(hr = texture_iface->lpVtbl->QueryInterface(texture_iface,
if (user_data->d3d11_device != device) &IID_IWineD3D11Texture2D, (void **)&wine_texture)))
{ {
void *timing_compositor = linux_side; return ivrcompositor_submit_wined3d(cpp_func, linux_side,
eye, texture, bounds, flags, version, user_data, wine_texture);
if (user_data->d3d11_device)
FIXME("Previous submit was from different D3D11 device.\n");
user_data->d3d11_device = device;
if (SUCCEEDED(hr = device->lpVtbl->QueryInterface(device,
&IID_IWineD3D11Device, (void **)&wined3d_device)))
{
user_data->wined3d_device = wined3d_device;
wined3d_device->lpVtbl->Release(wined3d_device);
}
else
{
ERR("Failed to get device, hr %#x.\n", hr);
user_data->wined3d_device = NULL;
}
TRACE("Enabling explicit timing mode.\n");
switch (version)
{
/* older, supported versions */
case 21:
cppIVRCompositor_IVRCompositor_021_SetExplicitTimingMode(linux_side,
VRCompositorTimingMode_Explicit_ApplicationPerformsPostPresentHandoff);
break;
default:
timing_compositor = get_our_compositor();
WARN("Performing our compositor hack for old compositor version %u.\n", version);
/* fall through, below version MUST match version in create_our_compositor() */
case 22:
cppIVRCompositor_IVRCompositor_022_SetExplicitTimingMode(timing_compositor,
VRCompositorTimingMode_Explicit_ApplicationPerformsPostPresentHandoff);
break;
}
}
device->lpVtbl->Release(device);
submit_data.linux_side = linux_side;
submit_data.submit = cpp_func;
submit_data.eye = eye;
switch(flags & (Submit_TextureWithPose | Submit_TextureWithDepth)){
case 0:
submit_data.texture = *texture;
break;
case Submit_TextureWithPose:
submit_data.texture_pose = *(VRTextureWithPose_t *)texture;
break;
case Submit_TextureWithDepth:
submit_data.texture_depth = *(VRTextureWithDepth_t *)texture;
depth_texture = (IUnknown*)submit_data.texture_depth.depth.handle;
break;
case Submit_TextureWithPose | Submit_TextureWithDepth:
submit_data.texture_both = *(VRTextureWithPoseAndDepth_t *)texture;
depth_texture = (IUnknown*)submit_data.texture_both.depth.handle;
break;
}
submit_data.bounds = *bounds;
submit_data.flags = flags;
wine_texture->lpVtbl->access_gl_texture(wine_texture,
d3d11_texture_callback, depth_texture, &submit_data, sizeof(submit_data));
wine_texture->lpVtbl->Release(wine_texture);
return 0;
} }
#if !defined(__APPLE__) || defined(__x86_64__) #if !defined(__APPLE__) || defined(__x86_64__)
@ -798,7 +811,7 @@ void ivrcompositor_post_present_handoff(void (*cpp_func)(void *),
if (user_data->dxvk_device) if (user_data->dxvk_device)
user_data->dxvk_device->lpVtbl->LockSubmissionQueue(user_data->dxvk_device); user_data->dxvk_device->lpVtbl->LockSubmissionQueue(user_data->dxvk_device);
#endif #endif
cpp_func(linux_side); cpp_func(linux_side);
#if !defined(__APPLE__) || defined(__x86_64__) #if !defined(__APPLE__) || defined(__x86_64__)