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

vrclient: Introduce VRCLIENT_HAVE_DXVK.

Browse source
This commit is contained in:
Józef Kucia 2018-09-10 17:58:35 +02:00 committed by Andrew Eikum
parent cad4edfed8
commit c0f2627396
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
vrclient_x64/vrclient_x64/vrclient_main.c
View file

@ -16,8 +16,7 @@
#include "initguid.h"
#if !defined(__APPLE__) || defined(__x86_64__)
/* 32-bit Mac doesn't support Vulkan and thus DXVK */
#ifdef VRCLIENT_HAVE_DXVK
#include "dxvk-interop.h"
#endif
@ -583,7 +582,7 @@ static EVRCompositorError ivrcompositor_submit_wined3d(
return 0;
}
#if !defined(__APPLE__) || defined(__x86_64__)
#ifdef VRCLIENT_HAVE_DXVK
static EVRCompositorError ivrcompositor_submit_dxvk(
EVRCompositorError (*cpp_func)(void *, EVREye, Texture_t *, VRTextureBounds_t *, EVRSubmitFlags),
void *linux_side, EVREye eye, Texture_t *texture, VRTextureBounds_t *bounds, EVRSubmitFlags flags,
@ -753,7 +752,7 @@ EVRCompositorError ivrcompositor_submit(
eye, texture, bounds, flags, version, user_data, wine_texture);
}
#if !defined(__APPLE__) || defined(__x86_64__)
#ifdef VRCLIENT_HAVE_DXVK
{
IDXGIVkInteropSurface *dxvk_surface;
@ -813,14 +812,14 @@ void ivrcompositor_post_present_handoff(void (*cpp_func)(void *),
return;
}
#if !defined(__APPLE__) || defined(__x86_64__)
#ifdef VRCLIENT_HAVE_DXVK
if (user_data->dxvk_device)
user_data->dxvk_device->lpVtbl->LockSubmissionQueue(user_data->dxvk_device);
#endif
cpp_func(linux_side);
#if !defined(__APPLE__) || defined(__x86_64__)
#ifdef VRCLIENT_HAVE_DXVK
if (user_data->dxvk_device)
user_data->dxvk_device->lpVtbl->ReleaseSubmissionQueue(user_data->dxvk_device);
#endif
@ -869,14 +868,14 @@ EVRCompositorError ivrcompositor_wait_get_poses(
TRACE("%p, %p, %u, %p, %u\n", linux_side, render_poses, render_pose_count, game_poses, game_pose_count);
#if !defined(__APPLE__) || defined(__x86_64__)
#ifdef VRCLIENT_HAVE_DXVK
if (user_data->dxvk_device)
user_data->dxvk_device->lpVtbl->LockSubmissionQueue(user_data->dxvk_device);
#endif
r = cpp_func(linux_side, render_poses, render_pose_count, game_poses, game_pose_count);
#if !defined(__APPLE__) || defined(__x86_64__)
#ifdef VRCLIENT_HAVE_DXVK
if (user_data->dxvk_device)
user_data->dxvk_device->lpVtbl->ReleaseSubmissionQueue(user_data->dxvk_device);
#endif

7
vrclient_x64/vrclient_x64/vrclient_private.h
View file

@ -1,5 +1,10 @@
#include <stdint.h>
/* 32-bit Mac doesn't support Vulkan and thus DXVK */
#if !defined(__APPLE__) || defined(__x86_64__)
#define VRCLIENT_HAVE_DXVK
#endif
/* TODO these should be generated */
typedef struct __winISteamClient winISteamClient;
typedef struct __winISteamUser winISteamUser;
@ -57,7 +62,7 @@ struct compositor_data
{
ID3D11Device *d3d11_device;
IWineD3D11Device *wined3d_device;
#if !defined(__APPLE__) || defined(__x86_64__)
#ifdef VRCLIENT_HAVE_DXVK
IDXGIVkInteropDevice *dxvk_device;
#endif
};