From fe590700ddc50b08cd04f76bf774b700e6cc98b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Fri, 13 Oct 2023 17:56:36 +0200 Subject: [PATCH] fixup! vrclient: Inline some IVRRenderModels override code. --- vrclient_x64/vrclient_x64/vrrendermodels_manual.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vrclient_x64/vrclient_x64/vrrendermodels_manual.c b/vrclient_x64/vrclient_x64/vrrendermodels_manual.c index f3480b13..7783be7e 100644 --- a/vrclient_x64/vrclient_x64/vrrendermodels_manual.c +++ b/vrclient_x64/vrclient_x64/vrrendermodels_manual.c @@ -221,9 +221,8 @@ static EVRRenderModelError ivrrendermodels_load_texture_d3d11_async( void *devic return error; } -static EVRRenderModelError ivrrendermodels_load_into_texture_d3d11_async( void *dst_texture ) +static EVRRenderModelError ivrrendermodels_load_into_texture_d3d11_async( void *dst_texture, struct winRenderModel_TextureMap_t_1237 *texture_map ) { - struct winRenderModel_TextureMap_t_1237 *texture_map = NULL; IUnknown *unk = dst_texture; EVRRenderModelError error; ID3D11Texture2D *texture; @@ -349,7 +348,7 @@ EVRRenderModelError __thiscall winIVRRenderModels_IVRRenderModels_005_LoadIntoTe return _ret; } - _ret = ivrrendermodels_load_into_texture_d3d11_async( pDstTexture ); + _ret = ivrrendermodels_load_into_texture_d3d11_async( pDstTexture, texture_map ); free_linux_texture_map_005( _this->u_iface, texture_map ); @@ -385,7 +384,7 @@ EVRRenderModelError __thiscall winIVRRenderModels_IVRRenderModels_006_LoadIntoTe return _ret; } - _ret = ivrrendermodels_load_into_texture_d3d11_async( pDstTexture ); + _ret = ivrrendermodels_load_into_texture_d3d11_async( pDstTexture, texture_map ); free_linux_texture_map_006( _this->u_iface, texture_map );