suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vrclient: Use Vulkan texture array for d3d11 texture arrays.

Browse source 
Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
This commit is contained in:
Paul Gofman 2021-03-16 19:17:01 +03:00 committed by Andrew Eikum
parent e0f82e30cb
commit 52415ddaa4
1 changed files with 9 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
vrclient_x64/vrclient_x64/vrclient_main.c
View file

@ -58,8 +58,6 @@ 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;
@ -455,11 +453,6 @@ 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));
} }
@ -882,7 +875,7 @@ static EVRCompositorError ivrcompositor_submit_dxvk(
unsigned int version, IDXGIVkInteropSurface *dxvk_surface) unsigned int version, IDXGIVkInteropSurface *dxvk_surface)
{ {
static const EVRSubmitFlags supported_flags = Submit_LensDistortionAlreadyApplied | Submit_FrameDiscontinuty; static const EVRSubmitFlags supported_flags = Submit_LensDistortionAlreadyApplied | Submit_FrameDiscontinuty;
struct VRVulkanTextureData_t vkdata; struct VRVulkanTextureArrayData_t vkdata;
IDXGIVkInteropDevice *dxvk_device; IDXGIVkInteropDevice *dxvk_device;
struct Texture_t vktexture; struct Texture_t vktexture;
@ -892,13 +885,20 @@ static EVRCompositorError ivrcompositor_submit_dxvk(
EVRCompositorError err; EVRCompositorError err;
vktexture = vrclient_translate_texture_dxvk(texture, &vkdata, dxvk_surface, &dxvk_device, &image_layout, &image_info); vktexture = vrclient_translate_texture_dxvk(texture, &vkdata.t, dxvk_surface, &dxvk_device, &image_layout, &image_info);
compositor_data.dxvk_device = dxvk_device; compositor_data.dxvk_device = dxvk_device;
if (flags & ~supported_flags) if (flags & ~supported_flags)
FIXME("Unhandled flags %#x.\n", flags); FIXME("Unhandled flags %#x.\n", flags);
if (image_info.arrayLayers > 1)
{
vkdata.m_unArrayIndex = eye;
vkdata.m_unArraySize = image_info.arrayLayers;
flags |= Submit_VulkanTextureWithArrayData;
}
subresources.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; subresources.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
subresources.baseMipLevel = 0; subresources.baseMipLevel = 0;
subresources.levelCount = image_info.mipLevels; subresources.levelCount = image_info.mipLevels;
@ -1084,55 +1084,6 @@ 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,
@ -1159,9 +1110,6 @@ 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)))
{ {