Skip to content

Commit

Permalink
# OpenVR SDK 1.16.8
Browse files Browse the repository at this point in the history
IVRCompositor:
* Added support for OpenGL array textures via the Submit_GLArrayTexture flag.


IVROverlay:
* Added support for overlays that support projections via SetOverlayTransformProjection

[git-p4: depot-paths = "//vr/steamvr/sdk_release/": change = 6385862]
  • Loading branch information
JoeLudwig committed Feb 25, 2021
1 parent e3d3756 commit 4c85abc
Show file tree
Hide file tree
Showing 34 changed files with 881 additions and 368 deletions.
Binary file modified bin/linux32/libopenvr_api.so
Binary file not shown.
Binary file modified bin/linux32/libopenvr_api.so.dbg
Binary file not shown.
Binary file modified bin/linux64/libopenvr_api.so
Binary file not shown.
Binary file modified bin/linux64/libopenvr_api.so.dbg
Binary file not shown.
Binary file modified bin/win32/openvr_api.dll
Binary file not shown.
Binary file modified bin/win32/openvr_api.dll.sig
Binary file not shown.
Binary file modified bin/win32/openvr_api.pdb
Binary file not shown.
Binary file modified bin/win64/openvr_api.dll
Binary file not shown.
Binary file modified bin/win64/openvr_api.dll.sig
Binary file not shown.
Binary file modified bin/win64/openvr_api.pdb
Binary file not shown.
512 changes: 305 additions & 207 deletions headers/openvr.h

Large diffs are not rendered by default.

72 changes: 60 additions & 12 deletions headers/openvr_api.cs
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ public struct IVRCompositor
internal _GetCurrentFadeColor GetCurrentFadeColor;

[UnmanagedFunctionPointer(CallingConvention.StdCall)]
internal delegate void _FadeGrid(float fSeconds, bool bFadeIn);
internal delegate void _FadeGrid(float fSeconds, bool bFadeGridIn);
[MarshalAs(UnmanagedType.FunctionPtr)]
internal _FadeGrid FadeGrid;

Expand Down Expand Up @@ -1120,6 +1120,11 @@ public struct IVROverlay
[MarshalAs(UnmanagedType.FunctionPtr)]
internal _GetOverlayTransformCursor GetOverlayTransformCursor;

[UnmanagedFunctionPointer(CallingConvention.StdCall)]
internal delegate EVROverlayError _SetOverlayTransformProjection(ulong ulOverlayHandle, ETrackingUniverseOrigin eTrackingOrigin, ref HmdMatrix34_t pmatTrackingOriginToOverlayTransform, ref VROverlayProjection_t pProjection, EVREye eEye);
[MarshalAs(UnmanagedType.FunctionPtr)]
internal _SetOverlayTransformProjection SetOverlayTransformProjection;

[UnmanagedFunctionPointer(CallingConvention.StdCall)]
internal delegate EVROverlayError _ShowOverlay(ulong ulOverlayHandle);
[MarshalAs(UnmanagedType.FunctionPtr)]
Expand Down Expand Up @@ -2899,9 +2904,9 @@ public HmdColor_t GetCurrentFadeColor(bool bBackground)
HmdColor_t result = FnTable.GetCurrentFadeColor(bBackground);
return result;
}
public void FadeGrid(float fSeconds,bool bFadeIn)
public void FadeGrid(float fSeconds,bool bFadeGridIn)
{
FnTable.FadeGrid(fSeconds,bFadeIn);
FnTable.FadeGrid(fSeconds,bFadeGridIn);
}
public float GetCurrentGridAlpha()
{
Expand Down Expand Up @@ -3310,6 +3315,11 @@ public EVROverlayError GetOverlayTransformCursor(ulong ulOverlayHandle,ref HmdVe
EVROverlayError result = FnTable.GetOverlayTransformCursor(ulOverlayHandle,ref pvHotspot);
return result;
}
public EVROverlayError SetOverlayTransformProjection(ulong ulOverlayHandle,ETrackingUniverseOrigin eTrackingOrigin,ref HmdMatrix34_t pmatTrackingOriginToOverlayTransform,ref VROverlayProjection_t pProjection,EVREye eEye)
{
EVROverlayError result = FnTable.SetOverlayTransformProjection(ulOverlayHandle,eTrackingOrigin,ref pmatTrackingOriginToOverlayTransform,ref pProjection,eEye);
return result;
}
public EVROverlayError ShowOverlay(ulong ulOverlayHandle)
{
EVROverlayError result = FnTable.ShowOverlay(ulOverlayHandle);
Expand Down Expand Up @@ -4704,9 +4714,13 @@ public enum ETrackedDeviceProperty
Prop_DisplaySupportsAnalogGain_Bool = 2085,
Prop_DisplayMinAnalogGain_Float = 2086,
Prop_DisplayMaxAnalogGain_Float = 2087,
Prop_CameraExposureTime_Float = 2088,
Prop_CameraGlobalGain_Float = 2089,
Prop_DashboardScale_Float = 2091,
Prop_IpdUIRangeMinMeters_Float = 2100,
Prop_IpdUIRangeMaxMeters_Float = 2101,
Prop_Hmd_SupportsHDCP14LegacyCompat_Bool = 2102,
Prop_Hmd_SupportsMicMonitoring_Bool = 2103,
Prop_DriverRequestedMuraCorrectionMode_Int32 = 2200,
Prop_DriverRequestedMuraFeather_InnerLeft_Int32 = 2201,
Prop_DriverRequestedMuraFeather_InnerRight_Int32 = 2202,
Expand Down Expand Up @@ -4801,6 +4815,8 @@ public enum EVRSubmitFlags
Submit_TextureWithDepth = 16,
Submit_FrameDiscontinuty = 32,
Submit_VulkanTextureWithArrayData = 64,
Submit_GlArrayTexture = 128,
Submit_Reserved2 = 32768,
}
public enum EVRState
{
Expand Down Expand Up @@ -5153,8 +5169,11 @@ public enum EVRApplicationType
VRApplication_SteamWatchdog = 6,
VRApplication_Bootstrapper = 7,
VRApplication_WebHelper = 8,
VRApplication_OpenXR = 9,
VRApplication_Max = 10,
VRApplication_OpenXRInstance = 9,
VRApplication_OpenXRScene = 10,
VRApplication_OpenXROverlay = 11,
VRApplication_Prism = 12,
VRApplication_Max = 13,
}
public enum EVRFirmwareError
{
Expand Down Expand Up @@ -5234,6 +5253,15 @@ public enum EVRInitError
Init_FailedForVrMonitor = 144,
Init_PropertyManagerInitFailed = 145,
Init_WebServerFailed = 146,
Init_IllegalTypeTransition = 147,
Init_MismatchedRuntimes = 148,
Init_InvalidProcessId = 149,
Init_VRServiceStartupFailed = 150,
Init_PrismNeedsNewDrivers = 151,
Init_PrismStartupTimedOut = 152,
Init_CouldNotStartPrism = 153,
Init_CreateDriverDirectDeviceFailed = 154,
Init_PrismExitedUnexpectedly = 155,
Driver_Failed = 200,
Driver_Unknown = 201,
Driver_HmdUnknown = 202,
Expand Down Expand Up @@ -5349,6 +5377,9 @@ public enum EVRInitError
Compositor_CreateOverlayInvalidCall = 488,
Compositor_CreateOverlayAlreadyInitialized = 489,
Compositor_FailedToCreateMailbox = 490,
Compositor_WindowInterfaceIsNull = 491,
Compositor_SystemLayerCreateInstance = 492,
Compositor_SystemLayerCreateSession = 493,
VendorSpecific_UnableToConnectToOculusRuntime = 1000,
VendorSpecific_WindowsNotInDevMode = 1001,
VendorSpecific_HmdFound_CantOpenDevice = 1101,
Expand Down Expand Up @@ -5466,6 +5497,7 @@ public enum EVRApplicationError
PropertyNotSet = 201,
UnknownProperty = 202,
InvalidParameter = 203,
NotImplemented = 300,
}
public enum EVRApplicationProperty
{
Expand Down Expand Up @@ -5556,6 +5588,7 @@ public enum VROverlayTransformType
VROverlayTransform_DashboardTab = 5,
VROverlayTransform_DashboardThumb = 6,
VROverlayTransform_Mountable = 7,
VROverlayTransform_Projection = 8,
}
public enum VROverlayFlags
{
Expand Down Expand Up @@ -5949,6 +5982,11 @@ private static void _copysign(ref float sizeval, float signval)
public HmdVector2_t vTopLeft;
public HmdVector2_t vBottomRight;
}
[StructLayout(LayoutKind.Sequential)] public struct VRBoneTransform_t
{
public HmdVector4_t position;
public HmdQuaternionf_t orientation;
}
[StructLayout(LayoutKind.Sequential)] public struct DistortionCoordinates_t
{
public float rfRed0; //float[2]
Expand Down Expand Up @@ -6079,6 +6117,7 @@ private static void _copysign(ref float sizeval, float signval)
{
public ulong overlayHandle;
public ulong devicePath;
public ulong memoryBlockId;
}
[StructLayout(LayoutKind.Sequential)] public struct VREvent_Status_t
{
Expand Down Expand Up @@ -6301,11 +6340,6 @@ public void Unpack(ref VRControllerState_t unpacked)
unpacked.rAxis4 = this.rAxis4;
}
}
[StructLayout(LayoutKind.Sequential)] public struct VRBoneTransform_t
{
public HmdVector4_t position;
public HmdQuaternionf_t orientation;
}
[StructLayout(LayoutKind.Sequential)] public struct CameraVideoStreamFrameHeader_t
{
public EVRTrackedCameraFrameType eFrameType;
Expand Down Expand Up @@ -6433,6 +6467,13 @@ public void Unpack(ref VRControllerState_t unpacked)
public EVROverlayIntersectionMaskPrimitiveType m_nPrimitiveType;
public VROverlayIntersectionMaskPrimitive_Data_t m_Primitive;
}
[StructLayout(LayoutKind.Sequential)] public struct VROverlayProjection_t
{
public float fLeft;
public float fRight;
public float fTop;
public float fBottom;
}
[StructLayout(LayoutKind.Sequential)] public struct VROverlayView_t
{
public ulong overlayHandle;
Expand Down Expand Up @@ -7519,12 +7560,12 @@ public static uint GetInitToken()
public const string IVRApplications_Version = "IVRApplications_007";
public const string IVRChaperone_Version = "IVRChaperone_004";
public const string IVRChaperoneSetup_Version = "IVRChaperoneSetup_006";
public const string IVRCompositor_Version = "IVRCompositor_026";
public const string IVRCompositor_Version = "IVRCompositor_027";
public const uint k_unVROverlayMaxKeyLength = 128;
public const uint k_unVROverlayMaxNameLength = 128;
public const uint k_unMaxOverlayCount = 128;
public const uint k_unMaxOverlayIntersectionMaskPrimitivesCount = 32;
public const string IVROverlay_Version = "IVROverlay_024";
public const string IVROverlay_Version = "IVROverlay_025";
public const string IVROverlayView_Version = "IVROverlayView_003";
public const uint k_unHeadsetViewMaxWidth = 3840;
public const uint k_unHeadsetViewMaxHeight = 2160;
Expand Down Expand Up @@ -7559,6 +7600,7 @@ public static uint GetInitToken()
public const string k_pch_SteamVR_PlayAreaColor_String = "playAreaColor";
public const string k_pch_SteamVR_TrackingLossColor_String = "trackingLossColor";
public const string k_pch_SteamVR_ShowStage_Bool = "showStage";
public const string k_pch_SteamVR_DrawTrackingReferences_Bool = "drawTrackingReferences";
public const string k_pch_SteamVR_ActivateMultipleDrivers_Bool = "activateMultipleDrivers";
public const string k_pch_SteamVR_UsingSpeakers_Bool = "usingSpeakers";
public const string k_pch_SteamVR_SpeakersForwardYawOffsetDegrees_Float = "speakersForwardYawOffsetDegrees";
Expand All @@ -7569,6 +7611,8 @@ public static uint GetInitToken()
public const string k_pch_SteamVR_MaxRecommendedResolution_Int32 = "maxRecommendedResolution";
public const string k_pch_SteamVR_MotionSmoothing_Bool = "motionSmoothing";
public const string k_pch_SteamVR_MotionSmoothingOverride_Int32 = "motionSmoothingOverride";
public const string k_pch_SteamVR_FramesToThrottle_Int32 = "framesToThrottle";
public const string k_pch_SteamVR_AdditionalFramesToPredict_Int32 = "additionalFramesToPredict";
public const string k_pch_SteamVR_DisableAsyncReprojection_Bool = "disableAsync";
public const string k_pch_SteamVR_ForceFadeOnBadTracking_Bool = "forceFadeOnBadTracking";
public const string k_pch_SteamVR_DefaultMirrorView_Int32 = "mirrorView";
Expand Down Expand Up @@ -7611,6 +7655,8 @@ public static uint GetInitToken()
public const string k_pch_SteamVR_OverlayRenderQuality = "overlayRenderQuality_2";
public const string k_pch_SteamVR_BlockOculusSDKOnOpenVRLaunchOption_Bool = "blockOculusSDKOnOpenVRLaunchOption";
public const string k_pch_SteamVR_BlockOculusSDKOnAllLaunches_Bool = "blockOculusSDKOnAllLaunches";
public const string k_pch_SteamVR_HDCPLegacyCompatibility_Bool = "hdcp14legacyCompatibility";
public const string k_pch_SteamVR_UsePrism_Bool = "usePrism";
public const string k_pch_DirectMode_Section = "direct_mode";
public const string k_pch_DirectMode_Enable_Bool = "enable";
public const string k_pch_DirectMode_Count_Int32 = "count";
Expand Down Expand Up @@ -7703,6 +7749,7 @@ public static uint GetInitToken()
public const string k_pch_audio_LastHmdPlaybackDeviceId_String = "lastHmdPlaybackDeviceId";
public const string k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
public const string k_pch_audio_DualSpeakerAndJackOutput_Bool = "dualSpeakerAndJackOutput";
public const string k_pch_audio_MuteMicMonitor_Bool = "muteMicMonitor";
public const string k_pch_Power_Section = "power";
public const string k_pch_Power_PowerOffOnExit_Bool = "powerOffOnExit";
public const string k_pch_Power_TurnOffScreensTimeout_Float = "turnOffScreensTimeout";
Expand All @@ -7716,6 +7763,7 @@ public static uint GetInitToken()
public const string k_pch_Dashboard_Position = "position";
public const string k_pch_Dashboard_DesktopScale = "desktopScale";
public const string k_pch_Dashboard_DashboardScale = "dashboardScale";
public const string k_pch_Dashboard_UseStandaloneSystemLayer = "standaloneSystemLayer";
public const string k_pch_modelskin_Section = "modelskins";
public const string k_pch_Driver_Enable_Bool = "enable";
public const string k_pch_Driver_BlockedBySafemode_Bool = "blocked_by_safe_mode";
Expand Down
Loading

1 comment on commit 4c85abc

@okawo80085
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Practically all include changes in src/ and src/vrcommon from this commit result in broken builds, why was src/vrcommon not renamed to src/vrcore to accommodate the include path changes?
Why is vrcore/assert.h added in the code, but missing in the file tree? Also an addition of assert.h in one of your include directories, which vrcore supposed to be, will break assert.h includes from the standard library which are present in other source files
Was this release tested at all?
It does not build!

Please sign in to comment.