SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keyboard Parse Fix (#467)

Browse Source 
* fixed input sending bug not properly releasing keys

* updated to ovr 1.12.5

* added disable oculus api button experimental

* small refactor and fix float and bool bugs
This commit is contained in:
ykeara
2020-06-05 15:42:10 -05:00
committed by GitHub
parent 4757756d32
commit 82a0357748
21 changed files with 1297 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third-party/openvr/headers/openvr.h
Vendored
+17 -2
View File
@@ -15,8 +15,8 @@
namespace vr
{
static const uint32_t k_nSteamVRVersionMajor = 1;
static const uint32_t k_nSteamVRVersionMinor = 11;
static const uint32_t k_nSteamVRVersionBuild = 11;
static const uint32_t k_nSteamVRVersionMinor = 12;
static const uint32_t k_nSteamVRVersionBuild = 5;
} // namespace vr
// vrtypes.h
@@ -634,6 +634,9 @@ enum EVRSubmitFlags
// Set to indicate a discontinuity between this and the last frame.
// This will prevent motion smoothing from attempting to extrapolate using the pair.
Submit_FrameDiscontinuty = 0x20,
// Set to indicate that pTexture->handle is a contains VRVulkanTextureArrayData_t
Submit_VulkanTextureWithArrayData = 0x40,
};
/** Data required for passing Vulkan textures to IVRCompositor::Submit.
@@ -650,6 +653,15 @@ struct VRVulkanTextureData_t
uint32_t m_nWidth, m_nHeight, m_nFormat, m_nSampleCount;
};
/** Data required for passing Vulkan texture arrays to IVRCompositor::Submit.
* Be sure to call OpenVR_Shutdown before destroying these resources.
* Please see https://github.com/ValveSoftware/openvr/wiki/Vulkan for Vulkan-specific documentation */
struct VRVulkanTextureArrayData_t : public VRVulkanTextureData_t
{
uint32_t m_unArrayIndex;
uint32_t m_unArraySize;
};
/** Data required for passing D3D12 textures to IVRCompositor::Submit.
* Be sure to call OpenVR_Shutdown before destroying these resources. */
struct D3D12TextureData_t
@@ -2700,6 +2712,8 @@ namespace vr
static const char * const k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";
static const char * const k_pch_SteamVR_AllowGlobalActionSetPriority = "globalActionSetPriority";
static const char * const k_pch_SteamVR_OverlayRenderQuality = "overlayRenderQuality_2";
static const char * const k_pch_SteamVR_BlockOculusSDKOnOpenVRLaunchOption_Bool = "blockOculusSDKOnOpenVRLaunchOption";
static const char * const k_pch_SteamVR_BlockOculusSDKOnAllLaunches_Bool = "blockOculusSDKOnAllLaunches";
//-----------------------------------------------------------------------------
// direct mode keys
@@ -2878,6 +2892,7 @@ namespace vr
static const char* const k_pch_App_BindingPreviousURLSuffix_String = "PreviousURL";
static const char* const k_pch_App_NeedToUpdateAutosaveSuffix_Bool = "NeedToUpdateAutosave";
static const char* const k_pch_App_DominantHand_Int32 = "DominantHand";
static const char* const k_pch_App_BlockOculusSDK_Bool = "blockOculusSDK";
//-----------------------------------------------------------------------------
// configuration for trackers
third-party/openvr/headers/openvr_api.cs
Vendored
+719 -144
View File
File diff suppressed because it is too large Load Diff
third-party/openvr/headers/openvr_api.json
Vendored
+317
View File
@@ -39,6 +39,7 @@
,{"typedef": "vr::VRFirmwareError","type": "enum vr::EVRFirmwareError"}
,{"typedef": "vr::VRCompositorError","type": "enum vr::EVRCompositorError"}
,{"typedef": "vr::VRScreenshotsError","type": "enum vr::EVRScreenshotError"}
,{"typedef": "vr::PathHandle_t","type": "uint64_t"}
],
"enums":[
{"enumname": "vr::EVREye","values": [
@@ -327,6 +328,7 @@
,{"name": "Submit_TextureWithPose","value": "8"}
,{"name": "Submit_TextureWithDepth","value": "16"}
,{"name": "Submit_FrameDiscontinuty","value": "32"}
,{"name": "Submit_VulkanTextureWithArrayData","value": "64"}
]}
, {"enumname": "vr::EVRState","values": [
{"name": "VRState_Undefined","value": "-1"}
@@ -1201,6 +1203,29 @@
{"name": "VRDebugError_Success","value": "0"}
,{"name": "VRDebugError_BadParameter","value": "1"}
]}
, {"enumname": "vr::EPropertyWriteType","values": [
{"name": "PropertyWrite_Set","value": "0"}
,{"name": "PropertyWrite_Erase","value": "1"}
,{"name": "PropertyWrite_SetError","value": "2"}
]}
, {"enumname": "vr::EBlockQueueError","values": [
{"name": "BlockQueueError_None","value": "0"}
,{"name": "BlockQueueError_QueueAlreadyExists","value": "1"}
,{"name": "BlockQueueError_QueueNotFound","value": "2"}
,{"name": "BlockQueueError_BlockNotAvailable","value": "3"}
,{"name": "BlockQueueError_InvalidHandle","value": "4"}
,{"name": "BlockQueueError_InvalidParam","value": "5"}
,{"name": "BlockQueueError_ParamMismatch","value": "6"}
,{"name": "BlockQueueError_InternalError","value": "7"}
,{"name": "BlockQueueError_AlreadyInitialized","value": "8"}
,{"name": "BlockQueueError_OperationIsServerOnly","value": "9"}
,{"name": "BlockQueueError_TooManyConnections","value": "10"}
]}
, {"enumname": "vr::EBlockQueueReadType","values": [
{"name": "BlockQueueRead_Latest","value": "0"}
,{"name": "BlockQueueRead_New","value": "1"}
,{"name": "BlockQueueRead_Next","value": "2"}
]}
],
"consts":[{
"constname": "k_nDriverNone","consttype": "const uint32_t", "constval": "4294967295"}
@@ -1484,6 +1509,10 @@
"constname": "k_pch_SteamVR_AllowGlobalActionSetPriority","consttype": "const char *const", "constval": "globalActionSetPriority"}
,{
"constname": "k_pch_SteamVR_OverlayRenderQuality","consttype": "const char *const", "constval": "overlayRenderQuality_2"}
,{
"constname": "k_pch_SteamVR_BlockOculusSDKOnOpenVRLaunchOption_Bool","consttype": "const char *const", "constval": "blockOculusSDKOnOpenVRLaunchOption"}
,{
"constname": "k_pch_SteamVR_BlockOculusSDKOnAllLaunches_Bool","consttype": "const char *const", "constval": "blockOculusSDKOnAllLaunches"}
,{
"constname": "k_pch_DirectMode_Section","consttype": "const char *const", "constval": "direct_mode"}
,{
@@ -1724,6 +1753,8 @@
"constname": "k_pch_App_NeedToUpdateAutosaveSuffix_Bool","consttype": "const char *const", "constval": "NeedToUpdateAutosave"}
,{
"constname": "k_pch_App_DominantHand_Int32","consttype": "const char *const", "constval": "DominantHand"}
,{
"constname": "k_pch_App_BlockOculusSDK_Bool","consttype": "const char *const", "constval": "blockOculusSDK"}
,{
"constname": "k_pch_Trackers_Section","consttype": "const char *const", "constval": "trackers"}
,{
@@ -1778,6 +1809,90 @@
"constname": "IVRSpatialAnchors_Version","consttype": "const char *const", "constval": "IVRSpatialAnchors_001"}
,{
"constname": "IVRDebug_Version","consttype": "const char *const", "constval": "IVRDebug_001"}
,{
"constname": "k_ulDisplayRedirectContainer","consttype": "const PropertyContainerHandle_t", "constval": "25769803779"}
,{
"constname": "IVRProperties_Version","consttype": "const char *const", "constval": "IVRProperties_001"}
,{
"constname": "k_pchPathUserHandRight","consttype": "const char *", "constval": "/user/hand/right"}
,{
"constname": "k_pchPathUserHandLeft","consttype": "const char *", "constval": "/user/hand/left"}
,{
"constname": "k_pchPathUserHandPrimary","consttype": "const char *", "constval": "/user/hand/primary"}
,{
"constname": "k_pchPathUserHandSecondary","consttype": "const char *", "constval": "/user/hand/secondary"}
,{
"constname": "k_pchPathUserHead","consttype": "const char *", "constval": "/user/head"}
,{
"constname": "k_pchPathUserGamepad","consttype": "const char *", "constval": "/user/gamepad"}
,{
"constname": "k_pchPathUserTreadmill","consttype": "const char *", "constval": "/user/treadmill"}
,{
"constname": "k_pchPathUserStylus","consttype": "const char *", "constval": "/user/stylus"}
,{
"constname": "k_pchPathDevices","consttype": "const char *", "constval": "/devices"}
,{
"constname": "k_pchPathDevicePath","consttype": "const char *", "constval": "/device_path"}
,{
"constname": "k_pchPathBestAliasPath","consttype": "const char *", "constval": "/best_alias_path"}
,{
"constname": "k_pchPathBoundTrackerAliasPath","consttype": "const char *", "constval": "/bound_tracker_path"}
,{
"constname": "k_pchPathBoundTrackerRole","consttype": "const char *", "constval": "/bound_tracker_role"}
,{
"constname": "k_pchPathPoseRaw","consttype": "const char *", "constval": "/pose/raw"}
,{
"constname": "k_pchPathPoseTip","consttype": "const char *", "constval": "/pose/tip"}
,{
"constname": "k_pchPathSystemButtonClick","consttype": "const char *", "constval": "/input/system/click"}
,{
"constname": "k_pchPathProximity","consttype": "const char *", "constval": "/proximity"}
,{
"constname": "k_pchPathControllerTypePrefix","consttype": "const char *", "constval": "/controller_type/"}
,{
"constname": "k_pchPathInputProfileSuffix","consttype": "const char *", "constval": "/input_profile"}
,{
"constname": "k_pchPathBindingNameSuffix","consttype": "const char *", "constval": "/binding_name"}
,{
"constname": "k_pchPathBindingUrlSuffix","consttype": "const char *", "constval": "/binding_url"}
,{
"constname": "k_pchPathBindingErrorSuffix","consttype": "const char *", "constval": "/binding_error"}
,{
"constname": "k_pchPathActiveActionSets","consttype": "const char *", "constval": "/active_action_sets"}
,{
"constname": "k_pchPathComponentUpdates","consttype": "const char *", "constval": "/total_component_updates"}
,{
"constname": "k_pchPathUserFootLeft","consttype": "const char *", "constval": "/user/foot/left"}
,{
"constname": "k_pchPathUserFootRight","consttype": "const char *", "constval": "/user/foot/right"}
,{
"constname": "k_pchPathUserShoulderLeft","consttype": "const char *", "constval": "/user/shoulder/left"}
,{
"constname": "k_pchPathUserShoulderRight","consttype": "const char *", "constval": "/user/shoulder/right"}
,{
"constname": "k_pchPathUserElbowLeft","consttype": "const char *", "constval": "/user/elbow/left"}
,{
"constname": "k_pchPathUserElbowRight","consttype": "const char *", "constval": "/user/elbow/right"}
,{
"constname": "k_pchPathUserKneeLeft","consttype": "const char *", "constval": "/user/knee/left"}
,{
"constname": "k_pchPathUserKneeRight","consttype": "const char *", "constval": "/user/knee/right"}
,{
"constname": "k_pchPathUserWaist","consttype": "const char *", "constval": "/user/waist"}
,{
"constname": "k_pchPathUserChest","consttype": "const char *", "constval": "/user/chest"}
,{
"constname": "k_pchPathUserCamera","consttype": "const char *", "constval": "/user/camera"}
,{
"constname": "k_pchPathUserKeyboard","consttype": "const char *", "constval": "/user/keyboard"}
,{
"constname": "k_pchPathClientAppKey","consttype": "const char *", "constval": "/client_info/app_key"}
,{
"constname": "k_ulInvalidPathHandle","consttype": "const PathHandle_t", "constval": "0"}
,{
"constname": "IVRPaths_Version","consttype": "const char *const", "constval": "IVRPaths_001"}
,{
"constname": "IVRBlockQueue_Version","consttype": "const char *", "constval": "IVRBlockQueue_004"}
],
"structs":[{"struct": "vr::HmdMatrix34_t","fields": [
{ "fieldname": "m", "fieldtype": "float [3][4]"}]}
@@ -1854,6 +1969,9 @@
{ "fieldname": "m_nHeight", "fieldtype": "uint32_t"},
{ "fieldname": "m_nFormat", "fieldtype": "uint32_t"},
{ "fieldname": "m_nSampleCount", "fieldtype": "uint32_t"}]}
,{"struct": "vr::VRVulkanTextureArrayData_t","fields": [
{ "fieldname": "m_unArrayIndex", "fieldtype": "uint32_t"},
{ "fieldname": "m_unArraySize", "fieldtype": "uint32_t"}]}
,{"struct": "vr::D3D12TextureData_t","fields": [
{ "fieldname": "m_pResource", "fieldtype": "struct ID3D12Resource *"},
{ "fieldname": "m_pCommandQueue", "fieldtype": "struct ID3D12CommandQueue *"},
@@ -2213,6 +2331,40 @@
{ "fieldname": "m_pVRSpatialAnchors", "fieldtype": "class vr::IVRSpatialAnchors *"},
{ "fieldname": "m_pVRDebug", "fieldtype": "class vr::IVRDebug *"},
{ "fieldname": "m_pVRNotifications", "fieldtype": "class vr::IVRNotifications *"}]}
,{"struct": "vr::PropertyWrite_t","fields": [
{ "fieldname": "prop", "fieldtype": "enum vr::ETrackedDeviceProperty"},
{ "fieldname": "writeType", "fieldtype": "enum vr::EPropertyWriteType"},
{ "fieldname": "eSetError", "fieldtype": "enum vr::ETrackedPropertyError"},
{ "fieldname": "pvBuffer", "fieldtype": "void *"},
{ "fieldname": "unBufferSize", "fieldtype": "uint32_t"},
{ "fieldname": "unTag", "fieldtype": "PropertyTypeTag_t"},
{ "fieldname": "eError", "fieldtype": "enum vr::ETrackedPropertyError"}]}
,{"struct": "vr::PropertyRead_t","fields": [
{ "fieldname": "prop", "fieldtype": "enum vr::ETrackedDeviceProperty"},
{ "fieldname": "pvBuffer", "fieldtype": "void *"},
{ "fieldname": "unBufferSize", "fieldtype": "uint32_t"},
{ "fieldname": "unTag", "fieldtype": "PropertyTypeTag_t"},
{ "fieldname": "unRequiredBufferSize", "fieldtype": "uint32_t"},
{ "fieldname": "eError", "fieldtype": "enum vr::ETrackedPropertyError"}]}
,{"struct": "vr::CVRPropertyHelpers","fields": [
{ "fieldname": "m_pProperties", "fieldtype": "class vr::IVRProperties *"}]}
,{"struct": "vr::PathWrite_t","fields": [
{ "fieldname": "ulPath", "fieldtype": "PathHandle_t"},
{ "fieldname": "writeType", "fieldtype": "enum vr::EPropertyWriteType"},
{ "fieldname": "eSetError", "fieldtype": "enum vr::ETrackedPropertyError"},
{ "fieldname": "pvBuffer", "fieldtype": "void *"},
{ "fieldname": "unBufferSize", "fieldtype": "uint32_t"},
{ "fieldname": "unTag", "fieldtype": "PropertyTypeTag_t"},
{ "fieldname": "eError", "fieldtype": "enum vr::ETrackedPropertyError"},
{ "fieldname": "pszPath", "fieldtype": "const char *"}]}
,{"struct": "vr::PathRead_t","fields": [
{ "fieldname": "ulPath", "fieldtype": "PathHandle_t"},
{ "fieldname": "pvBuffer", "fieldtype": "void *"},
{ "fieldname": "unBufferSize", "fieldtype": "uint32_t"},
{ "fieldname": "unTag", "fieldtype": "PropertyTypeTag_t"},
{ "fieldname": "unRequiredBufferSize", "fieldtype": "uint32_t"},
{ "fieldname": "eError", "fieldtype": "enum vr::ETrackedPropertyError"},
{ "fieldname": "pszPath", "fieldtype": "const char *"}]}
],
"methods":[{
"classname": "vr::IVRSystem",
@@ -5372,5 +5524,170 @@
{ "paramname": "unResponseBufferSize" ,"paramtype": "uint32_t"}
]
}
,{
"classname": "vr::IVRProperties",
"methodname": "ReadPropertyBatch",
"returntype": "vr::ETrackedPropertyError",
"params": [
{ "paramname": "ulContainerHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "pBatch" ,"paramtype": "struct vr::PropertyRead_t *"},
{ "paramname": "unBatchEntryCount" ,"paramtype": "uint32_t"}
]
}
,{
"classname": "vr::IVRProperties",
"methodname": "WritePropertyBatch",
"returntype": "vr::ETrackedPropertyError",
"params": [
{ "paramname": "ulContainerHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "pBatch" ,"paramtype": "struct vr::PropertyWrite_t *"},
{ "paramname": "unBatchEntryCount" ,"paramtype": "uint32_t"}
]
}
,{
"classname": "vr::IVRProperties",
"methodname": "GetPropErrorNameFromEnum",
"returntype": "const char *",
"params": [
{ "paramname": "error" ,"paramtype": "vr::ETrackedPropertyError"}
]
}
,{
"classname": "vr::IVRProperties",
"methodname": "TrackedDeviceToPropertyContainer",
"returntype": "PropertyContainerHandle_t",
"params": [
{ "paramname": "nDevice" ,"paramtype": "vr::TrackedDeviceIndex_t"}
]
}
,{
"classname": "vr::IVRPaths",
"methodname": "ReadPathBatch",
"returntype": "vr::ETrackedPropertyError",
"params": [
{ "paramname": "ulRootHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "pBatch" ,"paramtype": "struct vr::PathRead_t *"},
{ "paramname": "unBatchEntryCount" ,"paramtype": "uint32_t"}
]
}
,{
"classname": "vr::IVRPaths",
"methodname": "WritePathBatch",
"returntype": "vr::ETrackedPropertyError",
"params": [
{ "paramname": "ulRootHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "pBatch" ,"paramtype": "struct vr::PathWrite_t *"},
{ "paramname": "unBatchEntryCount" ,"paramtype": "uint32_t"}
]
}
,{
"classname": "vr::IVRPaths",
"methodname": "StringToHandle",
"returntype": "vr::ETrackedPropertyError",
"params": [
{ "paramname": "pHandle" ,"paramtype": "vr::PathHandle_t *"},
{ "paramname": "pchPath" ,"paramtype": "const char *"}
]
}
,{
"classname": "vr::IVRPaths",
"methodname": "HandleToString",
"returntype": "vr::ETrackedPropertyError",
"params": [
{ "paramname": "pHandle" ,"paramtype": "vr::PathHandle_t"},
{ "paramname": "pchBuffer" ,"paramtype": "char *"},
{ "paramname": "unBufferSize" ,"paramtype": "uint32_t"},
{ "paramname": "punBufferSizeUsed" ,"paramtype": "uint32_t *"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "Create",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "pulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t *"},
{ "paramname": "pchPath" ,"paramtype": "const char *"},
{ "paramname": "unBlockDataSize" ,"paramtype": "uint32_t"},
{ "paramname": "unBlockHeaderSize" ,"paramtype": "uint32_t"},
{ "paramname": "unBlockCount" ,"paramtype": "uint32_t"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "Connect",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "pulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t *"},
{ "paramname": "pchPath" ,"paramtype": "const char *"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "Destroy",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "ulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "AcquireWriteOnlyBlock",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "ulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "pulBlockHandle" ,"paramtype": "vr::PropertyContainerHandle_t *"},
{ "paramname": "ppvBuffer" ,"paramtype": "void **"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "ReleaseWriteOnlyBlock",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "ulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "ulBlockHandle" ,"paramtype": "vr::PropertyContainerHandle_t"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "WaitAndAcquireReadOnlyBlock",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "ulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "pulBlockHandle" ,"paramtype": "vr::PropertyContainerHandle_t *"},
{ "paramname": "ppvBuffer" ,"paramtype": "const void **"},
{ "paramname": "eReadType" ,"paramtype": "vr::EBlockQueueReadType"},
{ "paramname": "unTimeoutMs" ,"paramtype": "uint32_t"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "AcquireReadOnlyBlock",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "ulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "pulBlockHandle" ,"paramtype": "vr::PropertyContainerHandle_t *"},
{ "paramname": "ppvBuffer" ,"paramtype": "const void **"},
{ "paramname": "eReadType" ,"paramtype": "vr::EBlockQueueReadType"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "ReleaseReadOnlyBlock",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "ulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "ulBlockHandle" ,"paramtype": "vr::PropertyContainerHandle_t"}
]
}
,{
"classname": "vr::IVRBlockQueue",
"methodname": "QueueHasReader",
"returntype": "vr::EBlockQueueError",
"params": [
{ "paramname": "ulQueueHandle" ,"paramtype": "vr::PropertyContainerHandle_t"},
{ "paramname": "pbHasReaders" ,"paramtype": "bool *"}
]
}
]
}
third-party/openvr/headers/openvr_capi.h
Vendored
+161
View File
@@ -59,6 +59,7 @@ typedef uint32_t PropertyTypeTag_t;
typedef uint64_t VRActionHandle_t;
typedef uint64_t VRActionSetHandle_t;
typedef uint64_t VRInputValueHandle_t;
typedef uint64_t PathHandle_t;
// OpenVR Constants
@@ -204,6 +205,8 @@ static const char * k_pch_SteamVR_CustomOffIconStyle_String = "customOffIconStyl
static const char * k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";
static const char * k_pch_SteamVR_AllowGlobalActionSetPriority = "globalActionSetPriority";
static const char * k_pch_SteamVR_OverlayRenderQuality = "overlayRenderQuality_2";
static const char * k_pch_SteamVR_BlockOculusSDKOnOpenVRLaunchOption_Bool = "blockOculusSDKOnOpenVRLaunchOption";
static const char * k_pch_SteamVR_BlockOculusSDKOnAllLaunches_Bool = "blockOculusSDKOnAllLaunches";
static const char * k_pch_DirectMode_Section = "direct_mode";
static const char * k_pch_DirectMode_Enable_Bool = "enable";
static const char * k_pch_DirectMode_Count_Int32 = "count";
@@ -324,6 +327,7 @@ static const char * k_pch_App_BindingCurrentURLSuffix_String = "CurrentURL";
static const char * k_pch_App_BindingPreviousURLSuffix_String = "PreviousURL";
static const char * k_pch_App_NeedToUpdateAutosaveSuffix_Bool = "NeedToUpdateAutosave";
static const char * k_pch_App_DominantHand_Int32 = "DominantHand";
static const char * k_pch_App_BlockOculusSDK_Bool = "blockOculusSDK";
static const char * k_pch_Trackers_Section = "trackers";
static const char * k_pch_DesktopUI_Section = "DesktopUI";
static const char * k_pch_LastKnown_Section = "LastKnown";
@@ -351,6 +355,48 @@ static const char * IVRIOBuffer_Version = "IVRIOBuffer_002";
static const unsigned long k_ulInvalidSpatialAnchorHandle = 0;
static const char * IVRSpatialAnchors_Version = "IVRSpatialAnchors_001";
static const char * IVRDebug_Version = "IVRDebug_001";
static const unsigned long long k_ulDisplayRedirectContainer = 25769803779;
static const char * IVRProperties_Version = "IVRProperties_001";
static const char * k_pchPathUserHandRight = "/user/hand/right";
static const char * k_pchPathUserHandLeft = "/user/hand/left";
static const char * k_pchPathUserHandPrimary = "/user/hand/primary";
static const char * k_pchPathUserHandSecondary = "/user/hand/secondary";
static const char * k_pchPathUserHead = "/user/head";
static const char * k_pchPathUserGamepad = "/user/gamepad";
static const char * k_pchPathUserTreadmill = "/user/treadmill";
static const char * k_pchPathUserStylus = "/user/stylus";
static const char * k_pchPathDevices = "/devices";
static const char * k_pchPathDevicePath = "/device_path";
static const char * k_pchPathBestAliasPath = "/best_alias_path";
static const char * k_pchPathBoundTrackerAliasPath = "/bound_tracker_path";
static const char * k_pchPathBoundTrackerRole = "/bound_tracker_role";
static const char * k_pchPathPoseRaw = "/pose/raw";
static const char * k_pchPathPoseTip = "/pose/tip";
static const char * k_pchPathSystemButtonClick = "/input/system/click";
static const char * k_pchPathProximity = "/proximity";
static const char * k_pchPathControllerTypePrefix = "/controller_type/";
static const char * k_pchPathInputProfileSuffix = "/input_profile";
static const char * k_pchPathBindingNameSuffix = "/binding_name";
static const char * k_pchPathBindingUrlSuffix = "/binding_url";
static const char * k_pchPathBindingErrorSuffix = "/binding_error";
static const char * k_pchPathActiveActionSets = "/active_action_sets";
static const char * k_pchPathComponentUpdates = "/total_component_updates";
static const char * k_pchPathUserFootLeft = "/user/foot/left";
static const char * k_pchPathUserFootRight = "/user/foot/right";
static const char * k_pchPathUserShoulderLeft = "/user/shoulder/left";
static const char * k_pchPathUserShoulderRight = "/user/shoulder/right";
static const char * k_pchPathUserElbowLeft = "/user/elbow/left";
static const char * k_pchPathUserElbowRight = "/user/elbow/right";
static const char * k_pchPathUserKneeLeft = "/user/knee/left";
static const char * k_pchPathUserKneeRight = "/user/knee/right";
static const char * k_pchPathUserWaist = "/user/waist";
static const char * k_pchPathUserChest = "/user/chest";
static const char * k_pchPathUserCamera = "/user/camera";
static const char * k_pchPathUserKeyboard = "/user/keyboard";
static const char * k_pchPathClientAppKey = "/client_info/app_key";
static const unsigned long long k_ulInvalidPathHandle = 0;
static const char * IVRPaths_Version = "IVRPaths_001";
static const char * IVRBlockQueue_Version = "IVRBlockQueue_004";
// OpenVR Enums
@@ -663,6 +709,7 @@ typedef enum EVRSubmitFlags
EVRSubmitFlags_Submit_TextureWithPose = 8,
EVRSubmitFlags_Submit_TextureWithDepth = 16,
EVRSubmitFlags_Submit_FrameDiscontinuty = 32,
EVRSubmitFlags_Submit_VulkanTextureWithArrayData = 64,
} EVRSubmitFlags;
typedef enum EVRState
@@ -1666,6 +1713,35 @@ typedef enum EVRDebugError
EVRDebugError_VRDebugError_BadParameter = 1,
} EVRDebugError;
typedef enum EPropertyWriteType
{
EPropertyWriteType_PropertyWrite_Set = 0,
EPropertyWriteType_PropertyWrite_Erase = 1,
EPropertyWriteType_PropertyWrite_SetError = 2,
} EPropertyWriteType;
typedef enum EBlockQueueError
{
EBlockQueueError_BlockQueueError_None = 0,
EBlockQueueError_BlockQueueError_QueueAlreadyExists = 1,
EBlockQueueError_BlockQueueError_QueueNotFound = 2,
EBlockQueueError_BlockQueueError_BlockNotAvailable = 3,
EBlockQueueError_BlockQueueError_InvalidHandle = 4,
EBlockQueueError_BlockQueueError_InvalidParam = 5,
EBlockQueueError_BlockQueueError_ParamMismatch = 6,
EBlockQueueError_BlockQueueError_InternalError = 7,
EBlockQueueError_BlockQueueError_AlreadyInitialized = 8,
EBlockQueueError_BlockQueueError_OperationIsServerOnly = 9,
EBlockQueueError_BlockQueueError_TooManyConnections = 10,
} EBlockQueueError;
typedef enum EBlockQueueReadType
{
EBlockQueueReadType_BlockQueueRead_Latest = 0,
EBlockQueueReadType_BlockQueueRead_New = 1,
EBlockQueueReadType_BlockQueueRead_Next = 2,
} EBlockQueueReadType;
// OpenVR typedefs
@@ -1711,6 +1787,7 @@ typedef EVROverlayError VROverlayError;
typedef EVRFirmwareError VRFirmwareError;
typedef EVRCompositorError VRCompositorError;
typedef EVRScreenshotError VRScreenshotsError;
typedef uint64_t PathHandle_t;
// OpenVR Structs
@@ -1852,6 +1929,12 @@ typedef struct VRVulkanTextureData_t
uint32_t m_nSampleCount;
} VRVulkanTextureData_t;
typedef struct VRVulkanTextureArrayData_t
{
uint32_t m_unArrayIndex;
uint32_t m_unArraySize;
} VRVulkanTextureArrayData_t;
typedef struct D3D12TextureData_t
{
struct ID3D12Resource * m_pResource; // struct ID3D12Resource *
@@ -2380,6 +2463,55 @@ typedef struct COpenVRContext
intptr_t m_pVRNotifications; // class vr::IVRNotifications *
} COpenVRContext;
typedef struct PropertyWrite_t
{
enum ETrackedDeviceProperty prop;
enum EPropertyWriteType writeType;
enum ETrackedPropertyError eSetError;
void * pvBuffer; // void *
uint32_t unBufferSize;
PropertyTypeTag_t unTag;
enum ETrackedPropertyError eError;
} PropertyWrite_t;
typedef struct PropertyRead_t
{
enum ETrackedDeviceProperty prop;
void * pvBuffer; // void *
uint32_t unBufferSize;
PropertyTypeTag_t unTag;
uint32_t unRequiredBufferSize;
enum ETrackedPropertyError eError;
} PropertyRead_t;
typedef struct CVRPropertyHelpers
{
intptr_t m_pProperties; // class vr::IVRProperties *
} CVRPropertyHelpers;
typedef struct PathWrite_t
{
PathHandle_t ulPath;
enum EPropertyWriteType writeType;
enum ETrackedPropertyError eSetError;
void * pvBuffer; // void *
uint32_t unBufferSize;
PropertyTypeTag_t unTag;
enum ETrackedPropertyError eError;
char * pszPath; // const char *
} PathWrite_t;
typedef struct PathRead_t
{
PathHandle_t ulPath;
void * pvBuffer; // void *
uint32_t unBufferSize;
PropertyTypeTag_t unTag;
uint32_t unRequiredBufferSize;
enum ETrackedPropertyError eError;
char * pszPath; // const char *
} PathRead_t;
typedef union
{
@@ -2881,6 +3013,35 @@ struct VR_IVRDebug_FnTable
uint32_t (OPENVR_FNTABLE_CALLTYPE *DriverDebugRequest)(TrackedDeviceIndex_t unDeviceIndex, char * pchRequest, char * pchResponseBuffer, uint32_t unResponseBufferSize);
};
struct VR_IVRProperties_FnTable
{
ETrackedPropertyError (OPENVR_FNTABLE_CALLTYPE *ReadPropertyBatch)(PropertyContainerHandle_t ulContainerHandle, struct PropertyRead_t * pBatch, uint32_t unBatchEntryCount);
ETrackedPropertyError (OPENVR_FNTABLE_CALLTYPE *WritePropertyBatch)(PropertyContainerHandle_t ulContainerHandle, struct PropertyWrite_t * pBatch, uint32_t unBatchEntryCount);
char * (OPENVR_FNTABLE_CALLTYPE *GetPropErrorNameFromEnum)(ETrackedPropertyError error);
PropertyContainerHandle_t (OPENVR_FNTABLE_CALLTYPE *TrackedDeviceToPropertyContainer)(TrackedDeviceIndex_t nDevice);
};
struct VR_IVRPaths_FnTable
{
ETrackedPropertyError (OPENVR_FNTABLE_CALLTYPE *ReadPathBatch)(PropertyContainerHandle_t ulRootHandle, struct PathRead_t * pBatch, uint32_t unBatchEntryCount);
ETrackedPropertyError (OPENVR_FNTABLE_CALLTYPE *WritePathBatch)(PropertyContainerHandle_t ulRootHandle, struct PathWrite_t * pBatch, uint32_t unBatchEntryCount);
ETrackedPropertyError (OPENVR_FNTABLE_CALLTYPE *StringToHandle)(PathHandle_t * pHandle, char * pchPath);
ETrackedPropertyError (OPENVR_FNTABLE_CALLTYPE *HandleToString)(PathHandle_t pHandle, char * pchBuffer, uint32_t unBufferSize, uint32_t * punBufferSizeUsed);
};
struct VR_IVRBlockQueue_FnTable
{
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *Create)(PropertyContainerHandle_t * pulQueueHandle, char * pchPath, uint32_t unBlockDataSize, uint32_t unBlockHeaderSize, uint32_t unBlockCount);
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *Connect)(PropertyContainerHandle_t * pulQueueHandle, char * pchPath);
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *Destroy)(PropertyContainerHandle_t ulQueueHandle);
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *AcquireWriteOnlyBlock)(PropertyContainerHandle_t ulQueueHandle, PropertyContainerHandle_t * pulBlockHandle, void ** ppvBuffer);
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *ReleaseWriteOnlyBlock)(PropertyContainerHandle_t ulQueueHandle, PropertyContainerHandle_t ulBlockHandle);
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *WaitAndAcquireReadOnlyBlock)(PropertyContainerHandle_t ulQueueHandle, PropertyContainerHandle_t * pulBlockHandle, void ** ppvBuffer, EBlockQueueReadType eReadType, uint32_t unTimeoutMs);
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *AcquireReadOnlyBlock)(PropertyContainerHandle_t ulQueueHandle, PropertyContainerHandle_t * pulBlockHandle, void ** ppvBuffer, EBlockQueueReadType eReadType);
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *ReleaseReadOnlyBlock)(PropertyContainerHandle_t ulQueueHandle, PropertyContainerHandle_t ulBlockHandle);
EBlockQueueError (OPENVR_FNTABLE_CALLTYPE *QueueHasReader)(PropertyContainerHandle_t ulQueueHandle, bool * pbHasReaders);
};
#if 0
// Global entry points
third-party/openvr/headers/openvr_driver.h
Vendored
+17 -2
View File
@@ -15,8 +15,8 @@
namespace vr
{
static const uint32_t k_nSteamVRVersionMajor = 1;
static const uint32_t k_nSteamVRVersionMinor = 11;
static const uint32_t k_nSteamVRVersionBuild = 11;
static const uint32_t k_nSteamVRVersionMinor = 12;
static const uint32_t k_nSteamVRVersionBuild = 5;
} // namespace vr
// vrtypes.h
@@ -634,6 +634,9 @@ enum EVRSubmitFlags
// Set to indicate a discontinuity between this and the last frame.
// This will prevent motion smoothing from attempting to extrapolate using the pair.
Submit_FrameDiscontinuty = 0x20,
// Set to indicate that pTexture->handle is a contains VRVulkanTextureArrayData_t
Submit_VulkanTextureWithArrayData = 0x40,
};
/** Data required for passing Vulkan textures to IVRCompositor::Submit.
@@ -650,6 +653,15 @@ struct VRVulkanTextureData_t
uint32_t m_nWidth, m_nHeight, m_nFormat, m_nSampleCount;
};
/** Data required for passing Vulkan texture arrays to IVRCompositor::Submit.
* Be sure to call OpenVR_Shutdown before destroying these resources.
* Please see https://github.com/ValveSoftware/openvr/wiki/Vulkan for Vulkan-specific documentation */
struct VRVulkanTextureArrayData_t : public VRVulkanTextureData_t
{
uint32_t m_unArrayIndex;
uint32_t m_unArraySize;
};
/** Data required for passing D3D12 textures to IVRCompositor::Submit.
* Be sure to call OpenVR_Shutdown before destroying these resources. */
struct D3D12TextureData_t
@@ -2282,6 +2294,8 @@ namespace vr
static const char * const k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";
static const char * const k_pch_SteamVR_AllowGlobalActionSetPriority = "globalActionSetPriority";
static const char * const k_pch_SteamVR_OverlayRenderQuality = "overlayRenderQuality_2";
static const char * const k_pch_SteamVR_BlockOculusSDKOnOpenVRLaunchOption_Bool = "blockOculusSDKOnOpenVRLaunchOption";
static const char * const k_pch_SteamVR_BlockOculusSDKOnAllLaunches_Bool = "blockOculusSDKOnAllLaunches";
//-----------------------------------------------------------------------------
// direct mode keys
@@ -2460,6 +2474,7 @@ namespace vr
static const char* const k_pch_App_BindingPreviousURLSuffix_String = "PreviousURL";
static const char* const k_pch_App_NeedToUpdateAutosaveSuffix_Bool = "NeedToUpdateAutosave";
static const char* const k_pch_App_DominantHand_Int32 = "DominantHand";
static const char* const k_pch_App_BlockOculusSDK_Bool = "blockOculusSDK";
//-----------------------------------------------------------------------------
// configuration for trackers