diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py index 046f3655..8b82303e 100755 --- a/vrclient_x64/gen_wrapper.py +++ b/vrclient_x64/gen_wrapper.py @@ -94,6 +94,30 @@ files = [ ), ] +next_is_size_structs = [ + "VREvent_t", + "VRControllerState001_t", + "InputAnalogActionData_t", + "InputDigitalActionData_t", + "InputPoseActionData_t", + "InputSkeletalActionData_t", + "CameraVideoStreamFrameHeader_t", + "Compositor_CumulativeStats", + "VRActiveActionSet_t", + "InputOriginInfo_t", + "InputBindingInfo_t", +] + +unhandled_next_is_size_structs = [ + "VROverlayIntersectionMaskPrimitive_t" # not next, but next-next uint32 is the size +] + +struct_size_fields = { + "Compositor_OverlaySettings": ["size"], + "Compositor_FrameTiming": ["size", "m_nSize"], + "DriverDirectMode_FrameTiming": ["m_nSize"], +} + path_conversions = [ { "parent_name": "SetActionManifestPath", @@ -488,10 +512,10 @@ def handle_method(cfile, classname, winclassname, cppname, method, cpp, cpp_h, e do_wrap and do_wrap[1] == param.spelling: cfile.write(", %s" % param.spelling) cpp.write("%s ? &lin : nullptr" % param.spelling) - if do_lin_to_win and \ - (do_lin_to_win[0] == "VREvent_t" or \ - do_lin_to_win[0] == "VRControllerState001_t"): - next_is_size = True + if do_win_to_lin: + assert(not do_win_to_lin[0] in unhandled_next_is_size_structs) + if do_win_to_lin[0] in next_is_size_structs: + next_is_size = True elif do_unwrap and do_unwrap[1] == param.spelling: cfile.write(", %s" % param.spelling) cpp.write("struct_%s_%s_unwrap(%s)" % (strip_ns(do_unwrap[0]), display_sdkver(sdkver), do_unwrap[1])) @@ -881,6 +905,9 @@ def handle_struct(sdkver, struct): struct_needs_conversion(m.type.get_canonical()): cppfile.write(" struct_" + strip_ns(m.type.spelling) + "_" + display_sdkver(sdkver) + "_" + src + "_to_" + dst + \ "(&" + src + "->" + m.displayname + ", &" + dst + "->" + m.displayname + ");\n") + elif struct.displayname in struct_size_fields and \ + m.displayname in struct_size_fields[struct.displayname]: + cppfile.write(" " + dst + "->" + m.displayname + " = sizeof(*" + dst + ");\n") else: cppfile.write(" " + dst + "->" + m.displayname + " = " + src + "->" + m.displayname + ";\n") diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp index f798d914..31bff672 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp @@ -40,7 +40,7 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1015_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); if(pActionData) struct_InputDigitalActionData_t_1015_lin_to_win(&lin, pActionData); return _ret; @@ -52,7 +52,7 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1015_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); if(pActionData) struct_InputAnalogActionData_t_1015_lin_to_win(&lin, pActionData); return _ret; @@ -64,7 +64,7 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetPoseActionData(void *linux_side, V vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1015_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); + _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); if(pActionData) struct_InputPoseActionData_t_1015_lin_to_win(&lin, pActionData); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp index 1f7af255..01f0c1da 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp @@ -40,7 +40,7 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1017_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1017_lin_to_win(&lin, pActionData); return _ret; @@ -52,7 +52,7 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1017_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1017_lin_to_win(&lin, pActionData); return _ret; @@ -64,7 +64,7 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetPoseActionData(void *linux_side, V vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1017_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1017_lin_to_win(&lin, pActionData); return _ret; @@ -76,7 +76,7 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1017_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputSkeletalActionData_t_1017_lin_to_win(&lin, pActionData); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp index 4f375f05..ef8a4873 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp @@ -40,7 +40,7 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1322_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1322_lin_to_win(&lin, pActionData); return _ret; @@ -52,7 +52,7 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1322_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1322_lin_to_win(&lin, pActionData); return _ret; @@ -64,7 +64,7 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetPoseActionData(void *linux_side, V vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1322_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1322_lin_to_win(&lin, pActionData); return _ret; @@ -76,7 +76,7 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1322_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); if(pActionData) struct_InputSkeletalActionData_t_1322_lin_to_win(&lin, pActionData); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp index f06f9cc7..3471dc95 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp @@ -40,7 +40,7 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1418_lin_to_win(&lin, pActionData); return _ret; @@ -52,7 +52,7 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1418_lin_to_win(&lin, pActionData); return _ret; @@ -64,7 +64,7 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetPoseActionDataRelativeToNow(void * vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1418_lin_to_win(&lin, pActionData); return _ret; @@ -76,7 +76,7 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetPoseActionDataForNextFrame(void *l vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1418_lin_to_win(&lin, pActionData); return _ret; @@ -88,7 +88,7 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1418_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); if(pActionData) struct_InputSkeletalActionData_t_1418_lin_to_win(&lin, pActionData); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp index 6d1fdaa5..055bac71 100644 --- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp @@ -40,7 +40,7 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetDigitalActionData(void *linux_side vr::EVRInputError _ret; if(pActionData) struct_InputDigitalActionData_t_1610_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputDigitalActionData_t_1610_lin_to_win(&lin, pActionData); return _ret; @@ -52,7 +52,7 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetAnalogActionData(void *linux_side, vr::EVRInputError _ret; if(pActionData) struct_InputAnalogActionData_t_1610_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputAnalogActionData_t_1610_lin_to_win(&lin, pActionData); return _ret; @@ -64,7 +64,7 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetPoseActionDataRelativeToNow(void * vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1610_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1610_lin_to_win(&lin, pActionData); return _ret; @@ -76,7 +76,7 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetPoseActionDataForNextFrame(void *l vr::EVRInputError _ret; if(pActionData) struct_InputPoseActionData_t_1610_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice); + _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0, (vr::VRInputValueHandle_t)ulRestrictToDevice); if(pActionData) struct_InputPoseActionData_t_1610_lin_to_win(&lin, pActionData); return _ret; @@ -88,7 +88,7 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetSkeletalActionData(void *linux_sid vr::EVRInputError _ret; if(pActionData) struct_InputSkeletalActionData_t_1610_win_to_lin(pActionData, &lin); - _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize); + _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, unActionDataSize ? sizeof(lin) : 0); if(pActionData) struct_InputSkeletalActionData_t_1610_lin_to_win(&lin, pActionData); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp index 39c63eee..f1fe55f2 100644 --- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp @@ -50,7 +50,7 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader); return _ret; @@ -67,7 +67,7 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader); return _ret; @@ -79,7 +79,7 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader); return _ret; diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp index adc5ecd6..8e08d866 100644 --- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp +++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp @@ -50,7 +50,7 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader); return _ret; @@ -67,7 +67,7 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader); return _ret; @@ -79,7 +79,7 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea vr::EVRTrackedCameraError _ret; if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin); - _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize); + _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, nFrameHeaderSize ? sizeof(lin) : 0); if(pFrameHeader) struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader); return _ret; diff --git a/vrclient_x64/vrclient_x64/struct_converters_090.cpp b/vrclient_x64/vrclient_x64/struct_converters_090.cpp index 636afe0b..708088d1 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_090.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_090.cpp @@ -154,7 +154,7 @@ void struct_Compositor_FrameTiming_090_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_090 *win = (struct winCompositor_FrameTiming_090 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -166,7 +166,7 @@ void struct_Compositor_FrameTiming_090_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_090 *win = (struct winCompositor_FrameTiming_090 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_091.cpp b/vrclient_x64/vrclient_x64/struct_converters_091.cpp index abd11dff..f7be46a7 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_091.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_091.cpp @@ -154,7 +154,7 @@ void struct_Compositor_FrameTiming_091_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_091 *win = (struct winCompositor_FrameTiming_091 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -166,7 +166,7 @@ void struct_Compositor_FrameTiming_091_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_091 *win = (struct winCompositor_FrameTiming_091 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_0910.cpp b/vrclient_x64/vrclient_x64/struct_converters_0910.cpp index 99328906..761f2346 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_0910.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_0910.cpp @@ -162,7 +162,7 @@ void struct_Compositor_FrameTiming_0910_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_0910 *win = (struct winCompositor_FrameTiming_0910 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -182,7 +182,7 @@ void struct_Compositor_FrameTiming_0910_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_0910 *win = (struct winCompositor_FrameTiming_0910 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_0912.cpp b/vrclient_x64/vrclient_x64/struct_converters_0912.cpp index 75af165e..37efe2b3 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_0912.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_0912.cpp @@ -119,7 +119,7 @@ void struct_Compositor_FrameTiming_0912_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_0912 *win = (struct winCompositor_FrameTiming_0912 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -141,7 +141,7 @@ void struct_Compositor_FrameTiming_0912_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_0912 *win = (struct winCompositor_FrameTiming_0912 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_0913.cpp b/vrclient_x64/vrclient_x64/struct_converters_0913.cpp index 06d49789..624d68df 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_0913.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_0913.cpp @@ -120,7 +120,7 @@ void struct_Compositor_FrameTiming_0913_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_0913 *win = (struct winCompositor_FrameTiming_0913 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -143,7 +143,7 @@ void struct_Compositor_FrameTiming_0913_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_0913 *win = (struct winCompositor_FrameTiming_0913 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_0914.cpp b/vrclient_x64/vrclient_x64/struct_converters_0914.cpp index a60fb158..93ff3885 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_0914.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_0914.cpp @@ -133,7 +133,7 @@ void struct_Compositor_FrameTiming_0914_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_0914 *win = (struct winCompositor_FrameTiming_0914 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -157,7 +157,7 @@ void struct_Compositor_FrameTiming_0914_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_0914 *win = (struct winCompositor_FrameTiming_0914 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_092.cpp b/vrclient_x64/vrclient_x64/struct_converters_092.cpp index 083d49a2..cde8d984 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_092.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_092.cpp @@ -154,7 +154,7 @@ void struct_Compositor_FrameTiming_092_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_092 *win = (struct winCompositor_FrameTiming_092 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -166,7 +166,7 @@ void struct_Compositor_FrameTiming_092_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_092 *win = (struct winCompositor_FrameTiming_092 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_093.cpp b/vrclient_x64/vrclient_x64/struct_converters_093.cpp index 6b1aa70c..129f08e0 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_093.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_093.cpp @@ -162,7 +162,7 @@ void struct_Compositor_FrameTiming_093_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_093 *win = (struct winCompositor_FrameTiming_093 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -182,7 +182,7 @@ void struct_Compositor_FrameTiming_093_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_093 *win = (struct winCompositor_FrameTiming_093 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_094.cpp b/vrclient_x64/vrclient_x64/struct_converters_094.cpp index 30c589bc..91c5e6af 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_094.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_094.cpp @@ -162,7 +162,7 @@ void struct_Compositor_FrameTiming_094_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_094 *win = (struct winCompositor_FrameTiming_094 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -182,7 +182,7 @@ void struct_Compositor_FrameTiming_094_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_094 *win = (struct winCompositor_FrameTiming_094 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_096.cpp b/vrclient_x64/vrclient_x64/struct_converters_096.cpp index 2e90c010..cc08a992 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_096.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_096.cpp @@ -162,7 +162,7 @@ void struct_Compositor_FrameTiming_096_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_096 *win = (struct winCompositor_FrameTiming_096 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -182,7 +182,7 @@ void struct_Compositor_FrameTiming_096_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_096 *win = (struct winCompositor_FrameTiming_096 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_097.cpp b/vrclient_x64/vrclient_x64/struct_converters_097.cpp index e5046b6c..fe0ec17e 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_097.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_097.cpp @@ -162,7 +162,7 @@ void struct_Compositor_FrameTiming_097_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_097 *win = (struct winCompositor_FrameTiming_097 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -182,7 +182,7 @@ void struct_Compositor_FrameTiming_097_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_097 *win = (struct winCompositor_FrameTiming_097 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_098.cpp b/vrclient_x64/vrclient_x64/struct_converters_098.cpp index 05dbcc6d..f24c4f91 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_098.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_098.cpp @@ -162,7 +162,7 @@ void struct_Compositor_FrameTiming_098_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_098 *win = (struct winCompositor_FrameTiming_098 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -182,7 +182,7 @@ void struct_Compositor_FrameTiming_098_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_098 *win = (struct winCompositor_FrameTiming_098 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_099.cpp b/vrclient_x64/vrclient_x64/struct_converters_099.cpp index 6021c549..eb57a0e5 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_099.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_099.cpp @@ -162,7 +162,7 @@ void struct_Compositor_FrameTiming_099_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_099 *win = (struct winCompositor_FrameTiming_099 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->size = lin->size; + win->size = sizeof(*win); win->frameStart = lin->frameStart; win->frameVSync = lin->frameVSync; win->droppedFrames = lin->droppedFrames; @@ -182,7 +182,7 @@ void struct_Compositor_FrameTiming_099_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_099 *win = (struct winCompositor_FrameTiming_099 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->size = win->size; + lin->size = sizeof(*lin); lin->frameStart = win->frameStart; lin->frameVSync = win->frameVSync; lin->droppedFrames = win->droppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_102.cpp b/vrclient_x64/vrclient_x64/struct_converters_102.cpp index 41315c86..faa3c80a 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_102.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_102.cpp @@ -96,7 +96,7 @@ void struct_Compositor_FrameTiming_102_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_102 *win = (struct winCompositor_FrameTiming_102 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->m_nSize = lin->m_nSize; + win->m_nSize = sizeof(*win); win->m_nFrameIndex = lin->m_nFrameIndex; win->m_nNumFramePresents = lin->m_nNumFramePresents; win->m_nNumDroppedFrames = lin->m_nNumDroppedFrames; @@ -125,7 +125,7 @@ void struct_Compositor_FrameTiming_102_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_102 *win = (struct winCompositor_FrameTiming_102 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->m_nSize = win->m_nSize; + lin->m_nSize = sizeof(*lin); lin->m_nFrameIndex = win->m_nFrameIndex; lin->m_nNumFramePresents = win->m_nNumFramePresents; lin->m_nNumDroppedFrames = win->m_nNumDroppedFrames; diff --git a/vrclient_x64/vrclient_x64/struct_converters_103.cpp b/vrclient_x64/vrclient_x64/struct_converters_103.cpp index 42b8e737..25945ed1 100644 --- a/vrclient_x64/vrclient_x64/struct_converters_103.cpp +++ b/vrclient_x64/vrclient_x64/struct_converters_103.cpp @@ -96,7 +96,7 @@ void struct_Compositor_FrameTiming_103_lin_to_win(void *l, void *w) { struct winCompositor_FrameTiming_103 *win = (struct winCompositor_FrameTiming_103 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - win->m_nSize = lin->m_nSize; + win->m_nSize = sizeof(*win); win->m_nFrameIndex = lin->m_nFrameIndex; win->m_nNumFramePresents = lin->m_nNumFramePresents; win->m_nNumDroppedFrames = lin->m_nNumDroppedFrames; @@ -125,7 +125,7 @@ void struct_Compositor_FrameTiming_103_win_to_lin(void *w, void *l) { struct winCompositor_FrameTiming_103 *win = (struct winCompositor_FrameTiming_103 *)w; Compositor_FrameTiming *lin = (Compositor_FrameTiming *)l; - lin->m_nSize = win->m_nSize; + lin->m_nSize = sizeof(*lin); lin->m_nFrameIndex = win->m_nFrameIndex; lin->m_nNumFramePresents = win->m_nNumFramePresents; lin->m_nNumDroppedFrames = win->m_nNumDroppedFrames;