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

vrclient: Factor out ivrcompositor_submit_dxvk().

Browse Source
This commit is contained in:
Józef Kucia 2018-09-10 17:45:17 +02:00 committed by Andrew Eikum
parent 66e149f87f
commit 53b798a62f
1 changed files with 79 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -583,42 +583,14 @@ static EVRCompositorError ivrcompositor_submit_wined3d(
return 0; return 0;
} }
EVRCompositorError ivrcompositor_submit( #if !defined(__APPLE__) || defined(__x86_64__)
static EVRCompositorError ivrcompositor_submit_dxvk(
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, IDXGIVkInteropSurface *dxvk_surface)
{ {
IWineD3D11Texture2D *wine_texture;
IUnknown *texture_iface;
HRESULT hr;
#if !defined(__APPLE__) || defined(__x86_64__)
IDXGIVkInteropSurface *dxvk_surface;
IDXGIVkInteropDevice *dxvk_device;
#endif
TRACE("%p, %#x, %p, %p, %#x\n", linux_side, eye, texture, bounds, flags);
switch (texture->eType)
{
case TextureType_DirectX:
{
TRACE("D3D11\n");
texture_iface = texture->handle;
if (SUCCEEDED(hr = texture_iface->lpVtbl->QueryInterface(texture_iface,
&IID_IWineD3D11Texture2D, (void **)&wine_texture)))
{
return ivrcompositor_submit_wined3d(cpp_func, linux_side,
eye, texture, bounds, flags, version, user_data, wine_texture);
}
#if !defined(__APPLE__) || defined(__x86_64__)
hr = texture_iface->lpVtbl->QueryInterface(texture_iface,
&IID_IDXGIVkInteropSurface, (void **)&dxvk_surface);
if (SUCCEEDED(hr)) {
struct VRVulkanTextureData_t vkdata; struct VRVulkanTextureData_t vkdata;
IDXGIVkInteropDevice *dxvk_device;
struct Texture_t vktexture; struct Texture_t vktexture;
VkImage image_handle; VkImage image_handle;
@ -628,29 +600,20 @@ EVRCompositorError ivrcompositor_submit(
EVRCompositorError err; EVRCompositorError err;
dxvk_surface->lpVtbl->GetDevice( dxvk_surface->lpVtbl->GetDevice(dxvk_surface, &dxvk_device);
dxvk_surface, &dxvk_device);
user_data->dxvk_device = dxvk_device; user_data->dxvk_device = dxvk_device;
dxvk_device->lpVtbl->GetVulkanHandles( dxvk_device->lpVtbl->GetVulkanHandles(dxvk_device, &vkdata.m_pInstance,
dxvk_device, &vkdata.m_pPhysicalDevice, &vkdata.m_pDevice);
&vkdata.m_pInstance,
&vkdata.m_pPhysicalDevice,
&vkdata.m_pDevice);
dxvk_device->lpVtbl->GetSubmissionQueue( dxvk_device->lpVtbl->GetSubmissionQueue(dxvk_device, &vkdata.m_pQueue, &vkdata.m_nQueueFamilyIndex);
dxvk_device,
&vkdata.m_pQueue,
&vkdata.m_nQueueFamilyIndex);
// DXVK needs this to be initialized correctly /* DXVK needs this to be initialized correctly */
image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
image_info.pNext = NULL; image_info.pNext = NULL;
dxvk_surface->lpVtbl->GetVulkanImageInfo( dxvk_surface->lpVtbl->GetVulkanImageInfo(dxvk_surface, &image_handle, &image_layout, &image_info);
dxvk_surface, &image_handle,
&image_layout, &image_info);
load_vk_unwrappers(); load_vk_unwrappers();
@ -674,8 +637,7 @@ EVRCompositorError ivrcompositor_submit(
subresources.baseArrayLayer = 0; subresources.baseArrayLayer = 0;
subresources.layerCount = image_info.arrayLayers; subresources.layerCount = image_info.arrayLayers;
dxvk_device->lpVtbl->TransitionSurfaceLayout( dxvk_device->lpVtbl->TransitionSurfaceLayout(dxvk_device, dxvk_surface, &subresources,
dxvk_device, dxvk_surface, &subresources,
image_layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); image_layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
dxvk_device->lpVtbl->FlushRenderingCommands(dxvk_device); dxvk_device->lpVtbl->FlushRenderingCommands(dxvk_device);
dxvk_device->lpVtbl->LockSubmissionQueue(dxvk_device); dxvk_device->lpVtbl->LockSubmissionQueue(dxvk_device);
@ -683,13 +645,51 @@ EVRCompositorError ivrcompositor_submit(
err = cpp_func(linux_side, eye, &vktexture, bounds, flags); err = cpp_func(linux_side, eye, &vktexture, bounds, flags);
dxvk_device->lpVtbl->ReleaseSubmissionQueue(dxvk_device); dxvk_device->lpVtbl->ReleaseSubmissionQueue(dxvk_device);
dxvk_device->lpVtbl->TransitionSurfaceLayout( dxvk_device->lpVtbl->TransitionSurfaceLayout(dxvk_device, dxvk_surface, &subresources,
dxvk_device, dxvk_surface, &subresources,
VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, image_layout); VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, image_layout);
dxvk_device->lpVtbl->Release(dxvk_device); dxvk_device->lpVtbl->Release(dxvk_device);
dxvk_surface->lpVtbl->Release(dxvk_surface); dxvk_surface->lpVtbl->Release(dxvk_surface);
return err; return err;
}
#endif
EVRCompositorError ivrcompositor_submit(
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;
IUnknown *texture_iface;
HRESULT hr;
TRACE("%p, %#x, %p, %p, %#x\n", linux_side, eye, texture, bounds, flags);
switch (texture->eType)
{
case TextureType_DirectX:
{
TRACE("D3D11\n");
texture_iface = texture->handle;
if (SUCCEEDED(hr = texture_iface->lpVtbl->QueryInterface(texture_iface,
&IID_IWineD3D11Texture2D, (void **)&wine_texture)))
{
return ivrcompositor_submit_wined3d(cpp_func, linux_side,
eye, texture, bounds, flags, version, user_data, wine_texture);
}
#if !defined(__APPLE__) || defined(__x86_64__)
{
IDXGIVkInteropSurface *dxvk_surface;
if (SUCCEEDED(hr = texture_iface->lpVtbl->QueryInterface(texture_iface,
&IID_IDXGIVkInteropSurface, (void **)&dxvk_surface)))
{
return ivrcompositor_submit_dxvk(cpp_func, linux_side,
eye, texture, bounds, flags, version, user_data, dxvk_surface);
}
} }
#endif #endif
@ -697,7 +697,6 @@ EVRCompositorError ivrcompositor_submit(
return cpp_func(linux_side, eye, texture, bounds, flags); return cpp_func(linux_side, eye, texture, bounds, flags);
} }
case TextureType_Vulkan: case TextureType_Vulkan:
{ {
struct VRVulkanTextureData_t our_vkdata, our_depth_vkdata, *their_vkdata; struct VRVulkanTextureData_t our_vkdata, our_depth_vkdata, *their_vkdata;