Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 23:25:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

vrclient: Fix IVRRenderModels usage

Browse Source
This commit is contained in:
Andrew Eikum 2018-11-05 11:25:28 -06:00
parent 9b5b0d36e6
commit b14b9ed721
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vrclient_x64/vrclient_x64/vrclient_main.c
View File

@ -30,9 +30,12 @@
typedef struct winRenderModel_t_1015 winRenderModel_t_1015; typedef struct winRenderModel_t_1015 winRenderModel_t_1015;
typedef struct winRenderModel_TextureMap_t_1015 winRenderModel_TextureMap_t_1015; typedef struct winRenderModel_TextureMap_t_1015 winRenderModel_TextureMap_t_1015;
#include "cppIVRRenderModels_IVRRenderModels_005.h" #include "cppIVRRenderModels_IVRRenderModels_005.h"
typedef struct winRenderModel_t_1017 winRenderModel_t_1017;
typedef struct winRenderModel_TextureMap_t_1017 winRenderModel_TextureMap_t_1017;
#include "cppIVRRenderModels_IVRRenderModels_006.h"
WINE_DEFAULT_DEBUG_CHANNEL(vrclient); WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
@ -1012,7 +1015,7 @@ EVRRenderModelError ivrrendermodels_load_into_texture_d3d11_async(
error = cppIVRRenderModels_IVRRenderModels_005_LoadTexture_Async(linux_side, texture_id, &texture_map); error = cppIVRRenderModels_IVRRenderModels_005_LoadTexture_Async(linux_side, texture_id, &texture_map);
break; break;
case 6: case 6:
error = cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(linux_side, texture_id, &texture_map); error = cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async(linux_side, texture_id, (struct winRenderModel_TextureMap_t_1017 **)&texture_map);
break; break;
} }
if (error == VRRenderModelError_Loading) if (error == VRRenderModelError_Loading)
@ -1037,7 +1040,14 @@ EVRRenderModelError ivrrendermodels_load_into_texture_d3d11_async(
error = VRRenderModelError_NotSupported; error = VRRenderModelError_NotSupported;
} }
cppIVRRenderModels_IVRRenderModels_005_FreeTexture(linux_side, texture_map); switch(version){
case 5:
cppIVRRenderModels_IVRRenderModels_005_FreeTexture(linux_side, texture_map);
break;
case 6:
cppIVRRenderModels_IVRRenderModels_006_FreeTexture(linux_side, (struct winRenderModel_TextureMap_t_1017 *)texture_map);
break;
}
return error; return error;
} }