From c0144a188b8cafd02b83c036d0f86fe30f384ac0 Mon Sep 17 00:00:00 2001 From: Paul Gofman Date: Fri, 29 Jan 2021 15:32:42 +0300 Subject: [PATCH] vrclient_x64: Perform skybox textures conversion for dxvk textures. --- vrclient_x64/gen_wrapper.py | 6 + vrclient_x64/vrclient_x64/vrclient_main.c | 113 +++++++++++++++++++ vrclient_x64/vrclient_x64/vrclient_private.h | 9 ++ vrclient_x64/vrclient_x64/winIVRCompositor.c | 34 +++--- 4 files changed, 145 insertions(+), 17 deletions(-) diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index 9062fcb7..6f0d320b 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -322,6 +322,11 @@ def ivrcompositor_submit(cppname, method): return "ivrcompositor_008_submit" return "ivrcompositor_submit" +def ivrcompositor_set_skybox_override(cppname, method): + if "008" in cppname: + return "ivrcompositor_008_set_skybox_override" + return "ivrcompositor_set_skybox_override" + def ivrcompositor_post_present_handoff(cppname, method): return "ivrcompositor_post_present_handoff" @@ -381,6 +386,7 @@ method_overrides = [ ("IVRSystem", "GetDXGIOutputInfo", ivrsystem_get_dxgi_output_info), ("IVRSystem", "GetOutputDevice", ivrsystem_get_output_device), ("IVRCompositor", "Submit", ivrcompositor_submit), + ("IVRCompositor", "SetSkyboxOverride", ivrcompositor_set_skybox_override), ("IVRCompositor", "PostPresentHandoff", ivrcompositor_post_present_handoff), ("IVRCompositor", "WaitGetPoses", ivrcompositor_wait_get_poses), ("IVRCompositor", "GetVulkanDeviceExtensionsRequired", ivrcompositor_get_vulkan_device_extensions_required), diff --git a/vrclient_x64/vrclient_x64/vrclient_main.c b/vrclient_x64/vrclient_x64/vrclient_main.c index da18f6ed..42f386e0 100644 --- a/vrclient_x64/vrclient_x64/vrclient_main.c +++ b/vrclient_x64/vrclient_x64/vrclient_main.c @@ -1095,6 +1095,119 @@ EVRCompositorError ivrcompositor_submit( } } +void ivrcompositor_008_set_skybox_override( + void (*cpp_func)(void *, GraphicsAPIConvention, void *, void *, void *, void *, void *, void *), + void *linux_side, GraphicsAPIConvention api, void *front, void *back, void *left, void *right, void *top, void *bottom, + unsigned int version, struct compositor_data *user_data) +{ + TRACE("%p, %#x, %p, %p, %p, %p, %p, %p.\n", linux_side, api, front, back, left, right, top, bottom); + + if (api == API_DirectX) + FIXME("Not implemented Direct3D API.\n"); + + cpp_func(linux_side, api, front, back, left, right, top, bottom); +} + +static EVRCompositorError ivrcompositor_set_skybox_override_d3d11( + EVRCompositorError (*cpp_func)(void *, Texture_t *textures, uint32_t count), + void *linux_side, Texture_t *textures, uint32_t count, + struct compositor_data *user_data) +{ + struct VRVulkanTextureData_t vkdata[6]; + IDXGIVkInteropSurface *dxvk_surface; + struct Texture_t vktexture[6]; + EVRCompositorError result; + unsigned int i; + + for (i = 0; i < count; ++i) + { + Texture_t *texture = &textures[i]; + IUnknown *texture_iface; + + if (!texture->handle) + { + ERR("No D3D11 texture %p.\n", texture); + return cpp_func(linux_side, textures, count); + } + if (textures[i].eType != TextureType_DirectX) + { + FIXME("Mixing texture types is not supported.\n"); + return 0; + } + + texture_iface = texture->handle; + +#ifdef VRCLIENT_HAVE_DXVK + if (SUCCEEDED(texture_iface->lpVtbl->QueryInterface(texture_iface, + &IID_IDXGIVkInteropSurface, (void **)&dxvk_surface))) + { + VkImageSubresourceRange subresources; + IDXGIVkInteropDevice *dxvk_device; + VkImageCreateInfo image_info; + VkImageLayout image_layout; + + vktexture[i] = vrclient_translate_texture_dxvk(texture, &vkdata[i], dxvk_surface, &dxvk_device, &image_layout, &image_info); + + if (user_data->dxvk_device && dxvk_device != user_data->dxvk_device) + { + ERR("Invalid dxvk_device %p, previous %p.\n", dxvk_device, user_data->dxvk_device); + dxvk_surface->lpVtbl->Release(dxvk_surface); + dxvk_device->lpVtbl->Release(dxvk_device); + return 0; + } + + user_data->dxvk_device = dxvk_device; + + subresources.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + subresources.baseMipLevel = 0; + subresources.levelCount = image_info.mipLevels; + subresources.baseArrayLayer = 0; + subresources.layerCount = image_info.arrayLayers; + + dxvk_device->lpVtbl->TransitionSurfaceLayout(dxvk_device, dxvk_surface, &subresources, + image_layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL); + + dxvk_surface->lpVtbl->Release(dxvk_surface); + dxvk_device->lpVtbl->Release(dxvk_device); + + continue; + } +#endif + FIXME("Unsupported d3d11 texture %p, i %u.\n", texture, i); + return 0; + } + user_data->dxvk_device->lpVtbl->FlushRenderingCommands(user_data->dxvk_device); + user_data->dxvk_device->lpVtbl->LockSubmissionQueue(user_data->dxvk_device); + + result = cpp_func(linux_side, vktexture, count); + + user_data->dxvk_device->lpVtbl->ReleaseSubmissionQueue(user_data->dxvk_device); + + TRACE("result %u.\n", result); + return result; +} + +EVRCompositorError ivrcompositor_set_skybox_override( + EVRCompositorError (*cpp_func)(void *, Texture_t *textures, uint32_t count), + void *linux_side, Texture_t *textures, uint32_t count, + unsigned int version, struct compositor_data *user_data) +{ + TRACE("cpp_func %p, linux_side %p, textures %p, count %u, version %u.\n", + cpp_func, linux_side, textures, count, version); + + if (!count || count > 6) + { + WARN("Invalid texture count %u.\n", count); + return cpp_func(linux_side, textures, count); + } + + if (textures[0].eType == TextureType_DirectX) + return ivrcompositor_set_skybox_override_d3d11(cpp_func, linux_side, textures, count, user_data); + + FIXME("Conversion for type %u is not supported.\n", textures[0].eType); + return 0; +} + struct post_present_handoff_data { void *linux_side; diff --git a/vrclient_x64/vrclient_x64/vrclient_private.h b/vrclient_x64/vrclient_x64/vrclient_private.h index 5d2f28c8..05d5551b 100644 --- a/vrclient_x64/vrclient_x64/vrclient_private.h +++ b/vrclient_x64/vrclient_x64/vrclient_private.h @@ -131,6 +131,15 @@ EVRCompositorError ivrcompositor_submit( void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags flags, unsigned int version, struct compositor_data *user_data); +void ivrcompositor_008_set_skybox_override( + void (*cpp_func)(void *, GraphicsAPIConvention, void *, void *, void *, void *, void *, void *), + void *linux_side, GraphicsAPIConvention api, void *front, void *back, void *left, void *right, void *top, void *bottom, + unsigned int version, struct compositor_data *user_data); +EVRCompositorError ivrcompositor_set_skybox_override( + EVRCompositorError (*cpp_func)(void *, Texture_t *textures, uint32_t count), + void *linux_side, Texture_t *textures, uint32_t count, + unsigned int version, struct compositor_data *user_data); + void ivrcompositor_post_present_handoff(void (*cpp_func)(void *), void *linux_side, unsigned int version, struct compositor_data *user_data); diff --git a/vrclient_x64/vrclient_x64/winIVRCompositor.c b/vrclient_x64/vrclient_x64/winIVRCompositor.c index 8a64c86d..66d7f4b4 100644 --- a/vrclient_x64/vrclient_x64/winIVRCompositor.c +++ b/vrclient_x64/vrclient_x64/winIVRCompositor.c @@ -143,7 +143,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_026_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_026_SetSkyboxOverride(winIVRCompositor_IVRCompositor_026 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_026_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_026_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 26, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_026_ClearSkyboxOverride, 4) @@ -666,7 +666,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_024_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_024_SetSkyboxOverride(winIVRCompositor_IVRCompositor_024 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_024_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_024_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 24, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_024_ClearSkyboxOverride, 4) @@ -1162,7 +1162,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_022_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_022_SetSkyboxOverride(winIVRCompositor_IVRCompositor_022 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_022_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_022_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 22, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_022_ClearSkyboxOverride, 4) @@ -1638,7 +1638,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_021_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_021_SetSkyboxOverride(winIVRCompositor_IVRCompositor_021 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_021_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_021_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 21, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_021_ClearSkyboxOverride, 4) @@ -2087,7 +2087,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_020_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_020_SetSkyboxOverride(winIVRCompositor_IVRCompositor_020 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_020_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_020_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 20, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_020_ClearSkyboxOverride, 4) @@ -2518,7 +2518,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_019_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_019_SetSkyboxOverride(winIVRCompositor_IVRCompositor_019 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_019_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_019_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 19, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_019_ClearSkyboxOverride, 4) @@ -2940,7 +2940,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_018_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_018_SetSkyboxOverride(winIVRCompositor_IVRCompositor_018 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_018_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_018_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 18, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_018_ClearSkyboxOverride, 4) @@ -3329,7 +3329,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_017_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_017_SetSkyboxOverride(winIVRCompositor_IVRCompositor_017 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_017_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_017_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 17, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_017_ClearSkyboxOverride, 4) @@ -3707,7 +3707,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_016_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_016_SetSkyboxOverride(winIVRCompositor_IVRCompositor_016 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_016_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_016_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 16, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_016_ClearSkyboxOverride, 4) @@ -4083,7 +4083,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_015_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_015_SetSkyboxOverride(winIVRCompositor_IVRCompositor_015 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_015_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_015_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 15, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_015_ClearSkyboxOverride, 4) @@ -4470,7 +4470,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_014_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_014_SetSkyboxOverride(winIVRCompositor_IVRCompositor_014 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_014_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_014_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 14, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_014_ClearSkyboxOverride, 4) @@ -4792,7 +4792,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_013_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_013_SetSkyboxOverride(winIVRCompositor_IVRCompositor_013 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_013_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_013_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 13, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_013_ClearSkyboxOverride, 4) @@ -5096,7 +5096,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_012_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_012_SetSkyboxOverride(winIVRCompositor_IVRCompositor_012 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_012_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_012_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 12, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_012_ClearSkyboxOverride, 4) @@ -5384,7 +5384,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_011_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_011_SetSkyboxOverride(winIVRCompositor_IVRCompositor_011 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_011_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_011_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 11, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_011_ClearSkyboxOverride, 4) @@ -5661,7 +5661,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_010_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_010_SetSkyboxOverride(winIVRCompositor_IVRCompositor_010 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_010_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_010_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 10, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_010_ClearSkyboxOverride, 4) @@ -5938,7 +5938,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_009_SetSkyboxOverride, 12 EVRCompositorError __thiscall winIVRCompositor_IVRCompositor_009_SetSkyboxOverride(winIVRCompositor_IVRCompositor_009 *_this, Texture_t * pTextures, uint32_t unTextureCount) { TRACE("%p\n", _this); - return cppIVRCompositor_IVRCompositor_009_SetSkyboxOverride(_this->linux_side, pTextures, unTextureCount); + return ivrcompositor_set_skybox_override(cppIVRCompositor_IVRCompositor_009_SetSkyboxOverride, _this->linux_side, pTextures, unTextureCount, 9, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_009_ClearSkyboxOverride, 4) @@ -6215,7 +6215,7 @@ DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_008_SetSkyboxOverride, 32 void __thiscall winIVRCompositor_IVRCompositor_008_SetSkyboxOverride(winIVRCompositor_IVRCompositor_008 *_this, GraphicsAPIConvention eTextureType, void * pFront, void * pBack, void * pLeft, void * pRight, void * pTop, void * pBottom) { TRACE("%p\n", _this); - cppIVRCompositor_IVRCompositor_008_SetSkyboxOverride(_this->linux_side, eTextureType, pFront, pBack, pLeft, pRight, pTop, pBottom); + ivrcompositor_008_set_skybox_override(cppIVRCompositor_IVRCompositor_008_SetSkyboxOverride, _this->linux_side, eTextureType, pFront, pBack, pLeft, pRight, pTop, pBottom, 8, &_this->user_data); } DEFINE_THISCALL_WRAPPER(winIVRCompositor_IVRCompositor_008_ClearSkyboxOverride, 4)