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: Handle Submit_TextureWithPose for TextureType_DirectX

Browse Source 
This resolves a black HMD with the log message
"fixme:vrclient:ivrcompositor_submit_dxvk Unhandled flags 0x8".

Link: https://github.com/ValveSoftware/Proton/pull/7286
This commit is contained in:
Tyson Whitehead 2023-12-01 13:38:38 -05:00 committed by Arkadiusz Hiler
parent 3813708ca9
commit 8c44c9e9ee
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vrclient_x64/vrcompositor_manual.c
View File

@ -13,7 +13,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
struct submit_state struct submit_state
{ {
w_Texture_t texture; union
{
w_Texture_t texture;
w_VRTextureWithPose_t texture_with_pose;
} texture;
w_VRVulkanTextureArrayData_t vkdata; w_VRVulkanTextureArrayData_t vkdata;
VkImageLayout image_layout; VkImageLayout image_layout;
VkImageSubresourceRange subresources; VkImageSubresourceRange subresources;
@ -24,7 +28,8 @@ struct submit_state
static const w_Texture_t *load_compositor_texture_dxvk( uint32_t eye, const w_Texture_t *texture, uint32_t *flags, static const w_Texture_t *load_compositor_texture_dxvk( uint32_t eye, const w_Texture_t *texture, uint32_t *flags,
struct submit_state *state ) struct submit_state *state )
{ {
static const uint32_t supported_flags = Submit_LensDistortionAlreadyApplied | Submit_FrameDiscontinuty; static const uint32_t supported_flags = Submit_LensDistortionAlreadyApplied | Submit_FrameDiscontinuty |
Submit_TextureWithPose;
w_VRVulkanTextureData_t vkdata; w_VRVulkanTextureData_t vkdata;
VkImageCreateInfo image_info; VkImageCreateInfo image_info;
IUnknown *texture_iface; IUnknown *texture_iface;
@ -44,8 +49,9 @@ static const w_Texture_t *load_compositor_texture_dxvk( uint32_t eye, const w_Te
return texture; return texture;
} }
state->texture = vrclient_translate_texture_dxvk( texture, &vkdata, state->dxvk_surface, &state->dxvk_device, state->texture.texture = vrclient_translate_texture_dxvk( texture, &vkdata, state->dxvk_surface, &state->dxvk_device,
&state->image_layout, &image_info ); &state->image_layout, &image_info );
state->vkdata.m_nImage = vkdata.m_nImage; state->vkdata.m_nImage = vkdata.m_nImage;
state->vkdata.m_pDevice = vkdata.m_pDevice; state->vkdata.m_pDevice = vkdata.m_pDevice;
state->vkdata.m_pPhysicalDevice = vkdata.m_pPhysicalDevice; state->vkdata.m_pPhysicalDevice = vkdata.m_pPhysicalDevice;
@ -56,7 +62,11 @@ static const w_Texture_t *load_compositor_texture_dxvk( uint32_t eye, const w_Te
state->vkdata.m_nHeight = vkdata.m_nHeight; state->vkdata.m_nHeight = vkdata.m_nHeight;
state->vkdata.m_nFormat = vkdata.m_nFormat; state->vkdata.m_nFormat = vkdata.m_nFormat;
state->vkdata.m_nSampleCount = vkdata.m_nSampleCount; state->vkdata.m_nSampleCount = vkdata.m_nSampleCount;
state->texture.handle = &state->vkdata; state->texture.texture.handle = &state->vkdata;
if (*flags & Submit_TextureWithPose)
((w_VRTextureWithPose_t *)&state->texture.texture)->mDeviceToAbsoluteTracking =
((w_VRTextureWithPose_t*)texture)->mDeviceToAbsoluteTracking;
compositor_data.dxvk_device = state->dxvk_device; compositor_data.dxvk_device = state->dxvk_device;
@ -80,7 +90,7 @@ static const w_Texture_t *load_compositor_texture_dxvk( uint32_t eye, const w_Te
state->dxvk_device->lpVtbl->FlushRenderingCommands( state->dxvk_device ); state->dxvk_device->lpVtbl->FlushRenderingCommands( state->dxvk_device );
state->dxvk_device->lpVtbl->LockSubmissionQueue( state->dxvk_device ); state->dxvk_device->lpVtbl->LockSubmissionQueue( state->dxvk_device );
return &state->texture; return &state->texture.texture;
} }
static void free_compositor_texture_dxvk( struct submit_state *state ) static void free_compositor_texture_dxvk( struct submit_state *state )