From 59205c21ee018a8b46e1e38d7d11facf0c5e51b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Mon, 2 Oct 2023 21:23:50 +0200 Subject: [PATCH] vrclient: Unwrap SetSkyboxOverride vulkan objects on the unix side. CW-Bug-Id: #22729 --- vrclient_x64/gen_wrapper.py | 2 +- .../cppIVRCompositor_IVRCompositor_009.cpp | 8 - .../cppIVRCompositor_IVRCompositor_010.cpp | 8 - .../cppIVRCompositor_IVRCompositor_011.cpp | 8 - .../cppIVRCompositor_IVRCompositor_012.cpp | 8 - .../cppIVRCompositor_IVRCompositor_013.cpp | 8 - .../cppIVRCompositor_IVRCompositor_014.cpp | 8 - .../cppIVRCompositor_IVRCompositor_015.cpp | 8 - .../cppIVRCompositor_IVRCompositor_016.cpp | 8 - .../cppIVRCompositor_IVRCompositor_017.cpp | 8 - .../cppIVRCompositor_IVRCompositor_018.cpp | 8 - .../cppIVRCompositor_IVRCompositor_019.cpp | 8 - .../cppIVRCompositor_IVRCompositor_020.cpp | 8 - .../cppIVRCompositor_IVRCompositor_021.cpp | 8 - .../cppIVRCompositor_IVRCompositor_022.cpp | 8 - .../cppIVRCompositor_IVRCompositor_024.cpp | 8 - .../cppIVRCompositor_IVRCompositor_026.cpp | 8 - .../cppIVRCompositor_IVRCompositor_027.cpp | 8 - .../vrclient_x64/unix_vrcompositor_manual.cpp | 244 ++++++++++++++++++ .../vrclient_x64/vrcompositor_manual.c | 5 - 20 files changed, 245 insertions(+), 142 deletions(-) diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index aa0bb252..a777032f 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -222,7 +222,7 @@ MANUAL_METHODS = { "IVRSystem_GetDXGIOutputInfo": lambda ver, abi: abi == 'w', "IVRSystem_GetOutputDevice": lambda ver, abi: abi == 'u' and ver > 16, "IVRCompositor_Submit": lambda ver, abi: abi == 'w' and ver > 8, - "IVRCompositor_SetSkyboxOverride": lambda ver, abi: abi == 'w' and ver > 8, + "IVRCompositor_SetSkyboxOverride": lambda ver, abi: ver > 8, "IVRCompositor_PostPresentHandoff": lambda ver, abi: abi == 'w', "IVRCompositor_WaitGetPoses": lambda ver, abi: abi == 'w' and ver > 15 and ver < 27, "IVRCompositor_GetVulkanDeviceExtensionsRequired": lambda ver, abi: abi == 'u', diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.cpp index 7ac2333b..e8b672da 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.cpp @@ -92,14 +92,6 @@ NTSTATUS IVRCompositor_IVRCompositor_009_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_009_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_009_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_009_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_009 *iface = (struct u_IVRCompositor_IVRCompositor_009 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_009_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_009_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_009_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.cpp index 408359de..fc743dbc 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.cpp @@ -92,14 +92,6 @@ NTSTATUS IVRCompositor_IVRCompositor_010_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_010_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_010_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_010_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_010 *iface = (struct u_IVRCompositor_IVRCompositor_010 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_010_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_010_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_010_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.cpp index c4180958..293cb2a9 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.cpp @@ -89,14 +89,6 @@ NTSTATUS IVRCompositor_IVRCompositor_011_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_011_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_011_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_011_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_011 *iface = (struct u_IVRCompositor_IVRCompositor_011 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_011_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_011_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_011_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.cpp index cc1d37f3..7f98aa72 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.cpp @@ -97,14 +97,6 @@ NTSTATUS IVRCompositor_IVRCompositor_012_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_012_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_012_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_012_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_012 *iface = (struct u_IVRCompositor_IVRCompositor_012 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_012_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_012_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_012_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.cpp index 0009a3ec..bb4b226b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.cpp @@ -97,14 +97,6 @@ NTSTATUS IVRCompositor_IVRCompositor_013_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_013_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_013_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_013_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_013 *iface = (struct u_IVRCompositor_IVRCompositor_013 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_013_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_013_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_013_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.cpp index fae2cd72..cb29af6b 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.cpp @@ -97,14 +97,6 @@ NTSTATUS IVRCompositor_IVRCompositor_014_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_014_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_014_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_014_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_014 *iface = (struct u_IVRCompositor_IVRCompositor_014 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_014_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_014_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_014_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.cpp index 776c4699..46b27614 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.cpp @@ -105,14 +105,6 @@ NTSTATUS IVRCompositor_IVRCompositor_015_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_015_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_015_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_015_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_015 *iface = (struct u_IVRCompositor_IVRCompositor_015 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_015_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_015_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_015_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.cpp index 17b60a94..0913041e 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.cpp @@ -108,14 +108,6 @@ NTSTATUS IVRCompositor_IVRCompositor_016_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_016_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_016_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_016_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_016 *iface = (struct u_IVRCompositor_IVRCompositor_016 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_016_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_016_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_016_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.cpp index fac117f4..eebf8602 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.cpp @@ -113,14 +113,6 @@ NTSTATUS IVRCompositor_IVRCompositor_017_FadeGrid( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_017_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_017_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_017_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_017 *iface = (struct u_IVRCompositor_IVRCompositor_017 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_017_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_017_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_017_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.cpp index d114fb86..4f7a0412 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.cpp @@ -129,14 +129,6 @@ NTSTATUS IVRCompositor_IVRCompositor_018_GetCurrentGridAlpha( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_018_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_018_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_018_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_018 *iface = (struct u_IVRCompositor_IVRCompositor_018 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_018_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_018_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_018_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.cpp index 689fdf6d..1add579d 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.cpp @@ -129,14 +129,6 @@ NTSTATUS IVRCompositor_IVRCompositor_019_GetCurrentGridAlpha( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_019_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_019_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_019_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_019 *iface = (struct u_IVRCompositor_IVRCompositor_019 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_019_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_019_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_019_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.cpp index 0aac064a..d18eb71d 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.cpp @@ -129,14 +129,6 @@ NTSTATUS IVRCompositor_IVRCompositor_020_GetCurrentGridAlpha( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_020_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_020_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_020_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_020 *iface = (struct u_IVRCompositor_IVRCompositor_020 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_020_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_020_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_020_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.cpp index b61df0a4..637f9346 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.cpp @@ -129,14 +129,6 @@ NTSTATUS IVRCompositor_IVRCompositor_021_GetCurrentGridAlpha( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_021_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_021_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_021_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_021 *iface = (struct u_IVRCompositor_IVRCompositor_021 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_021_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_021_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_021_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.cpp index 00e5053b..2fd3ca12 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.cpp @@ -129,14 +129,6 @@ NTSTATUS IVRCompositor_IVRCompositor_022_GetCurrentGridAlpha( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_022_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_022_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_022_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_022 *iface = (struct u_IVRCompositor_IVRCompositor_022 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_022_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_022_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_022_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.cpp index a6675a72..541be209 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.cpp @@ -129,14 +129,6 @@ NTSTATUS IVRCompositor_IVRCompositor_024_GetCurrentGridAlpha( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_024_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_024_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_024_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_024 *iface = (struct u_IVRCompositor_IVRCompositor_024 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_024_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_024_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_024_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp index 785db8d5..7dc883ba 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp @@ -129,14 +129,6 @@ NTSTATUS IVRCompositor_IVRCompositor_026_GetCurrentGridAlpha( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_026_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_026_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_026_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_026 *iface = (struct u_IVRCompositor_IVRCompositor_026 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_026_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_026_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_026_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.cpp index 21059556..1074d6af 100644 --- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.cpp @@ -129,14 +129,6 @@ NTSTATUS IVRCompositor_IVRCompositor_027_GetCurrentGridAlpha( void *args ) return 0; } -NTSTATUS IVRCompositor_IVRCompositor_027_SetSkyboxOverride( void *args ) -{ - struct IVRCompositor_IVRCompositor_027_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_027_SetSkyboxOverride_params *)args; - struct u_IVRCompositor_IVRCompositor_027 *iface = (struct u_IVRCompositor_IVRCompositor_027 *)params->linux_side; - params->_ret = (uint32_t)iface->SetSkyboxOverride( params->pTextures, params->unTextureCount ); - return 0; -} - NTSTATUS IVRCompositor_IVRCompositor_027_ClearSkyboxOverride( void *args ) { struct IVRCompositor_IVRCompositor_027_ClearSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_027_ClearSkyboxOverride_params *)args; diff --git a/vrclient_x64/vrclient_x64/unix_vrcompositor_manual.cpp b/vrclient_x64/vrclient_x64/unix_vrcompositor_manual.cpp index 084c3289..787694e0 100644 --- a/vrclient_x64/vrclient_x64/unix_vrcompositor_manual.cpp +++ b/vrclient_x64/vrclient_x64/unix_vrcompositor_manual.cpp @@ -1,5 +1,28 @@ #include "unix_private.h" +static u_VRVulkanTextureData_t *unwrap_texture_vkdata( const w_VRVulkanTextureData_t *w_vkdata, u_VRVulkanTextureData_t *u_vkdata ) +{ + if (!w_vkdata) return NULL; + + *u_vkdata = *w_vkdata; + u_vkdata->m_pDevice = p_get_native_VkDevice( w_vkdata->m_pDevice ); + u_vkdata->m_pPhysicalDevice = p_get_native_VkPhysicalDevice( w_vkdata->m_pPhysicalDevice ); + u_vkdata->m_pInstance = p_get_native_VkInstance( w_vkdata->m_pInstance ); + u_vkdata->m_pQueue = p_get_native_VkQueue( w_vkdata->m_pQueue ); + + return u_vkdata; +} + +static u_Texture_t unwrap_texture_data( const w_Texture_t *w_texture, uint32_t flags, u_VRVulkanTextureArrayData_t *u_vkdata ) +{ + u_Texture_t u_texture = *w_texture; + + if (w_texture->eType == TextureType_Vulkan) + u_texture.handle = unwrap_texture_vkdata( (w_VRVulkanTextureData_t *)w_texture->handle, (u_VRVulkanTextureData_t *)u_vkdata ); + + return u_texture; +} + NTSTATUS IVRCompositor_IVRCompositor_019_GetVulkanDeviceExtensionsRequired( void *args ) { struct IVRCompositor_IVRCompositor_019_GetVulkanDeviceExtensionsRequired_params *params = (struct IVRCompositor_IVRCompositor_019_GetVulkanDeviceExtensionsRequired_params *)args; @@ -62,3 +85,224 @@ NTSTATUS IVRCompositor_IVRCompositor_027_GetVulkanDeviceExtensionsRequired( void params->_ret = (uint32_t)iface->GetVulkanDeviceExtensionsRequired( host_device, params->pchValue, params->unBufferSize ); return 0; } + +NTSTATUS IVRCompositor_IVRCompositor_009_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_009_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_009_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_009 *iface = (struct u_IVRCompositor_IVRCompositor_009 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_010_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_010_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_010_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_010 *iface = (struct u_IVRCompositor_IVRCompositor_010 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_011_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_011_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_011_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_011 *iface = (struct u_IVRCompositor_IVRCompositor_011 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_012_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_012_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_012_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_012 *iface = (struct u_IVRCompositor_IVRCompositor_012 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_013_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_013_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_013_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_013 *iface = (struct u_IVRCompositor_IVRCompositor_013 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_014_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_014_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_014_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_014 *iface = (struct u_IVRCompositor_IVRCompositor_014 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_015_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_015_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_015_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_015 *iface = (struct u_IVRCompositor_IVRCompositor_015 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_016_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_016_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_016_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_016 *iface = (struct u_IVRCompositor_IVRCompositor_016 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_017_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_017_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_017_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_017 *iface = (struct u_IVRCompositor_IVRCompositor_017 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_018_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_018_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_018_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_018 *iface = (struct u_IVRCompositor_IVRCompositor_018 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_019_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_019_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_019_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_019 *iface = (struct u_IVRCompositor_IVRCompositor_019 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_020_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_020_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_020_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_020 *iface = (struct u_IVRCompositor_IVRCompositor_020 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_021_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_021_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_021_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_021 *iface = (struct u_IVRCompositor_IVRCompositor_021 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_022_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_022_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_022_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_022 *iface = (struct u_IVRCompositor_IVRCompositor_022 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_024_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_024_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_024_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_024 *iface = (struct u_IVRCompositor_IVRCompositor_024 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_026_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_026_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_026_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_026 *iface = (struct u_IVRCompositor_IVRCompositor_026 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} + +NTSTATUS IVRCompositor_IVRCompositor_027_SetSkyboxOverride( void *args ) +{ + struct IVRCompositor_IVRCompositor_027_SetSkyboxOverride_params *params = (struct IVRCompositor_IVRCompositor_027_SetSkyboxOverride_params *)args; + struct u_IVRCompositor_IVRCompositor_027 *iface = (struct u_IVRCompositor_IVRCompositor_027 *)params->linux_side; + u_VRVulkanTextureArrayData_t vkdata[params->unTextureCount]; + u_Texture_t textures[params->unTextureCount]; + uint32_t i; + + for (i = 0; i < params->unTextureCount; i++) textures[i] = unwrap_texture_data( params->pTextures + i, 0, &vkdata[i] ); + params->_ret = (uint32_t)iface->SetSkyboxOverride( textures, params->unTextureCount ); + return 0; +} diff --git a/vrclient_x64/vrclient_x64/vrcompositor_manual.c b/vrclient_x64/vrclient_x64/vrcompositor_manual.c index bdf90962..15bba99c 100644 --- a/vrclient_x64/vrclient_x64/vrcompositor_manual.c +++ b/vrclient_x64/vrclient_x64/vrcompositor_manual.c @@ -197,11 +197,6 @@ static const w_Texture_t *set_skybox_override_d3d11_init( const w_Texture_t *tex state->textures[i] = vrclient_translate_texture_dxvk( texture, &state->vkdata[i], dxvk_surface, &dxvk_device, &image_layout, &image_info ); - state->vkdata[i].m_pDevice = get_native_VkDevice( state->vkdata[i].m_pDevice ); - state->vkdata[i].m_pPhysicalDevice = get_native_VkPhysicalDevice( state->vkdata[i].m_pPhysicalDevice ); - state->vkdata[i].m_pInstance = get_native_VkInstance( state->vkdata[i].m_pInstance ); - state->vkdata[i].m_pQueue = get_native_VkQueue( state->vkdata[i].m_pQueue ); - if (compositor_data.dxvk_device && dxvk_device != compositor_data.dxvk_device) { ERR( "Invalid dxvk_device %p, previous %p.\n", dxvk_device, compositor_data.dxvk_device );