Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2025-05-31 15:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

vrclient: Report VK_WINE_openvr_device_extensions in IVRCompositor_GetVulkanDeviceExtensionsRequired().

Browse Source 
CW-Bug-Id: #24553
This commit is contained in:
Paul Gofman 2025-05-28 14:03:03 -06:00
parent bfeda97e32
commit 32e146c3e5
3 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vrclient_x64/unix_private.h
View File

@ -42,6 +42,8 @@ extern char *vrclient_dos_to_unix_path( const char *src );
extern void vrclient_free_path( char *path );
extern unsigned int vrclient_unix_path_to_dos_path( bool api_result, const char *src, char *dst, uint32_t dst_bytes );
extern BOOL load_vulkan(void);
#if defined(__x86_64__) || defined(__aarch64__)
#define VRCLIENT_UNIX_WOW64_IMPL( iface, version, method, ... ) \
NTSTATUS wow64_ ## iface ## _ ## iface ## _ ## version ## _ ## method( void *args ) \

64
vrclient_x64/unix_vrcompositor_manual.cpp
View File

@ -1,11 +1,18 @@
#include "unix_private.h"
#include <stdlib.h>
#define WINE_VK_HOST
#include <vulkan/vulkan.h>
#if 0
#pragma makedep unix
#endif
WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
extern PFN_vkGetPhysicalDeviceProperties p_vkGetPhysicalDeviceProperties;
static const w_VRTextureWithPose_t *get_texture_with_pose( const w_Texture_t *w_texture )
{
return (const w_VRTextureWithPose_t *)w_texture;
@ -166,18 +173,10 @@ static u_Texture_t *unwrap_submit_texture_data( const ptr32< const w32_Texture_t
template< typename Iface, typename Params >
static NTSTATUS IVRCompositor_GetVulkanDeviceExtensionsRequired( Iface *iface, Params *params, bool wow64 )
{
static const struct
{
const char *unix_ext;
const char *win_ext;
}
exts[] =
{
{ "VK_KHR_external_memory_fd", "VK_KHR_external_memory_win32" },
{ "VK_KHR_external_semaphore_fd", "VK_KHR_external_semaphore_win32" },
};
const char vrext[] = "VK_WINE_openvr_device_extensions";
VkPhysicalDevice_T *host_device = p_get_native_VkPhysicalDevice( params->pPhysicalDevice );
char buffer[2048], *p, *end, *next;
VkPhysicalDeviceProperties prop;
char buffer[2048], name[64];
uint32_t i, len;
len = iface->GetVulkanDeviceExtensionsRequired( host_device, buffer, sizeof(buffer) );
@ -188,38 +187,19 @@ static NTSTATUS IVRCompositor_GetVulkanDeviceExtensionsRequired( Iface *iface, P
return 0;
}
p = buffer;
end = p + strlen(p);
while (1)
{
while (isspace(*p)) ++p;
if (!*p) break;
next = p + 1;
while (*next && !isspace(*next)) ++next;
for (i = 0; i < ARRAY_SIZE(exts); ++i)
{
len = strlen( exts[i].unix_ext );
if (len == next - p && !memcmp( p, exts[i].unix_ext, len ))
{
len = strlen( exts[i].win_ext );
if (end - next + 1 + len + (p - buffer) > sizeof(buffer))
{
ERR( "buffer overflow.\n" );
params->_ret = 0;
return 0;
}
memmove( p + len, next, end - next + 1 );
memcpy( p, exts[i].win_ext, len );
end = p + len + (end - next);
next = p + len;
break;
}
}
p = next;
}
params->_ret = end - buffer + 1;
params->_ret = sizeof(vrext);
if (params->pchValue && params->unBufferSize >= params->_ret)
memcpy( params->pchValue, buffer, params->_ret );
memcpy( params->pchValue, vrext, params->_ret );
if (!load_vulkan())
{
ERR( "could not load Vulkan.\n" );
return 0;
}
p_vkGetPhysicalDeviceProperties( host_device, &prop );
sprintf( name, "VK_WINE_OPENVR_DEVICE_EXTS_PCIID_%04x_%04x", prop.vendorID, prop.deviceID );
setenv( name, buffer, 1 );
return 0;
}

8
vrclient_x64/unixlib.cpp
View File

@ -27,7 +27,7 @@ VkQueue_T *(*p_get_native_VkQueue)( VkQueue_T * );
static PFN_vkCreateInstance p_vkCreateInstance;
static PFN_vkDestroyInstance p_vkDestroyInstance;
static PFN_vkEnumeratePhysicalDevices p_vkEnumeratePhysicalDevices;
static PFN_vkGetPhysicalDeviceProperties p_vkGetPhysicalDeviceProperties;
PFN_vkGetPhysicalDeviceProperties p_vkGetPhysicalDeviceProperties;
static void *get_winevulkan_unixlib( HMODULE winevulkan )
{
@ -85,8 +85,9 @@ static BOOL load_vk_unwrappers( HMODULE winevulkan )
return TRUE;
}
static BOOL load_vulkan(void)
BOOL load_vulkan(void)
{
if (vulkan) return TRUE;
if (!(vulkan = dlopen( "libvulkan.so.1", RTLD_NOW )) &&
!(vulkan = dlopen( "libvulkan.so", RTLD_NOW )))
{
@ -99,6 +100,7 @@ static BOOL load_vulkan(void)
{ \
ERR( "%s not found.\n", #name ); \
dlclose( vulkan ); \
vulkan = NULL; \
return FALSE; \
}
@ -348,6 +350,8 @@ static NTSTATUS vrclient_unload( Params *params, bool wow64 )
vrclient = NULL;
p_HmdSystemFactory = NULL;
p_VRClientCoreFactory = NULL;
if (vulkan) dlclose( vulkan );
vulkan = NULL;
return 0;
}