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

vrclient_x64: Use staging texture for the right eye in case of submitted d3d11 texture array.

Browse Source
This commit is contained in:
Paul Gofman 2021-02-02 21:32:10 +03:00 committed by Andrew Eikum
parent 728b7b34db
commit e1ff3caee4
1 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -16,6 +16,9 @@
#include "initguid.h" #include "initguid.h"
#define COBJMACROS
#include "d3d11_4.h"
#ifdef VRCLIENT_HAVE_DXVK #ifdef VRCLIENT_HAVE_DXVK
#include "dxvk-interop.h" #include "dxvk-interop.h"
#endif #endif
@ -56,6 +59,8 @@ static struct
IDXGIVkInteropDevice *dxvk_device; IDXGIVkInteropDevice *dxvk_device;
#endif #endif
BOOL d3d11_explicit_handoff, handoff_called; BOOL d3d11_explicit_handoff, handoff_called;
ID3D11Texture2D *staging_texture;
D3D11_TEXTURE2D_DESC staging_texture_desc;
} }
compositor_data; compositor_data;
@ -445,6 +450,11 @@ static void destroy_compositor_data(void)
wined3d_device->lpVtbl->wait_idle(wined3d_device); wined3d_device->lpVtbl->wait_idle(wined3d_device);
} }
if (compositor_data.staging_texture)
{
TRACE("Release staging texture %p.\n", compositor_data.staging_texture);
ID3D11Texture2D_Release(compositor_data.staging_texture);
}
memset(&compositor_data, 0, sizeof(compositor_data)); memset(&compositor_data, 0, sizeof(compositor_data));
} }
@ -1065,6 +1075,55 @@ EVROverlayError ivroverlay_001_set_overlay_texture(
return VROverlayError_InvalidHandle; return VROverlayError_InvalidHandle;
} }
static ID3D11Texture2D *get_staging_texture_d3d11(ID3D11Texture2D *t, unsigned int eye)
{
ID3D11DeviceContext *context;
D3D11_TEXTURE2D_DESC desc;
ID3D11Device *device;
HRESULT hr;
memset(&desc, 0, sizeof(desc));
ID3D11Texture2D_GetDesc(t, &desc);
if (desc.ArraySize <= 1)
return t;
ID3D11Texture2D_GetDevice(t, &device);
TRACE("width %u, height %u, mips %u, array_size %u, usage %u, bindflags %#x, CPUAccessFlags %#x, "
"desc.MiscFlags %#x.\n", desc.Width, desc.Height, desc.MipLevels, desc.ArraySize, desc.Usage,
desc.BindFlags, desc.CPUAccessFlags, desc.MiscFlags);
desc.ArraySize = 1;
if (compositor_data.staging_texture && memcmp(&desc, &compositor_data.staging_texture_desc, sizeof(desc)))
{
TRACE("Recreating staging texture.\n");
ID3D11Texture2D_Release(compositor_data.staging_texture);
memset(&compositor_data.staging_texture_desc, 0, sizeof(compositor_data.staging_texture_desc));
compositor_data.staging_texture = NULL;
}
if (!compositor_data.staging_texture)
{
if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &compositor_data.staging_texture)))
{
ERR("ID3D11Device_CreateTexture2D failed, hr %#x.\n", hr);
ID3D11Device_Release(device);
return t;
}
TRACE("Created staging texture %p.\n", compositor_data.staging_texture);
compositor_data.staging_texture_desc = desc;
}
ID3D11Device_GetImmediateContext(device, &context);
ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)compositor_data.staging_texture,
0, 0, 0, 0, (ID3D11Resource *)t, eye * desc.MipLevels, NULL);
ID3D11DeviceContext_Release(context);
ID3D11Device_Release(device);
return compositor_data.staging_texture;
}
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,
@ -1091,6 +1150,9 @@ EVRCompositorError ivrcompositor_submit(
texture_iface = texture->handle; texture_iface = texture->handle;
if (eye)
texture_iface = (IUnknown *)get_staging_texture_d3d11((ID3D11Texture2D *)texture_iface, eye);
if (SUCCEEDED(hr = texture_iface->lpVtbl->QueryInterface(texture_iface, if (SUCCEEDED(hr = texture_iface->lpVtbl->QueryInterface(texture_iface,
&IID_IWineD3D11Texture2D, (void **)&wine_texture))) &IID_IWineD3D11Texture2D, (void **)&wine_texture)))
{ {