Skip to content

Commit 3a010f0

Browse files
committed
OpenVR SDK 1.12.5
Vulkan: * Added support for texture arrays [git-p4: depot-paths = "//vr/steamvr/sdk_release/": change = 5908460]
1 parent ace7060 commit 3a010f0

25 files changed

+1268
-148
lines changed

bin/linux32/libopenvr_api.so

148 Bytes
Binary file not shown.

bin/linux32/libopenvr_api.so.dbg

24.1 KB
Binary file not shown.

bin/linux64/libopenvr_api.so

4.52 KB
Binary file not shown.

bin/linux64/libopenvr_api.so.dbg

41 KB
Binary file not shown.

bin/win32/openvr_api.dll

0 Bytes
Binary file not shown.

bin/win32/openvr_api.dll.sig

0 Bytes
Binary file not shown.

bin/win32/openvr_api.pdb

16 KB
Binary file not shown.

bin/win64/openvr_api.dll

0 Bytes
Binary file not shown.

bin/win64/openvr_api.dll.sig

0 Bytes
Binary file not shown.

bin/win64/openvr_api.pdb

16 KB
Binary file not shown.

headers/openvr.h

+17-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
namespace vr
1616
{
1717
static const uint32_t k_nSteamVRVersionMajor = 1;
18-
static const uint32_t k_nSteamVRVersionMinor = 11;
19-
static const uint32_t k_nSteamVRVersionBuild = 11;
18+
static const uint32_t k_nSteamVRVersionMinor = 12;
19+
static const uint32_t k_nSteamVRVersionBuild = 5;
2020
} // namespace vr
2121

2222
// vrtypes.h
@@ -634,6 +634,9 @@ enum EVRSubmitFlags
634634
// Set to indicate a discontinuity between this and the last frame.
635635
// This will prevent motion smoothing from attempting to extrapolate using the pair.
636636
Submit_FrameDiscontinuty = 0x20,
637+
638+
// Set to indicate that pTexture->handle is a contains VRVulkanTextureArrayData_t
639+
Submit_VulkanTextureWithArrayData = 0x40,
637640
};
638641

639642
/** Data required for passing Vulkan textures to IVRCompositor::Submit.
@@ -650,6 +653,15 @@ struct VRVulkanTextureData_t
650653
uint32_t m_nWidth, m_nHeight, m_nFormat, m_nSampleCount;
651654
};
652655

656+
/** Data required for passing Vulkan texture arrays to IVRCompositor::Submit.
657+
* Be sure to call OpenVR_Shutdown before destroying these resources.
658+
* Please see https://github.com/ValveSoftware/openvr/wiki/Vulkan for Vulkan-specific documentation */
659+
struct VRVulkanTextureArrayData_t : public VRVulkanTextureData_t
660+
{
661+
uint32_t m_unArrayIndex;
662+
uint32_t m_unArraySize;
663+
};
664+
653665
/** Data required for passing D3D12 textures to IVRCompositor::Submit.
654666
* Be sure to call OpenVR_Shutdown before destroying these resources. */
655667
struct D3D12TextureData_t
@@ -2700,6 +2712,8 @@ namespace vr
27002712
static const char * const k_pch_SteamVR_CustomIconForceUpdate_String = "customIconForceUpdate";
27012713
static const char * const k_pch_SteamVR_AllowGlobalActionSetPriority = "globalActionSetPriority";
27022714
static const char * const k_pch_SteamVR_OverlayRenderQuality = "overlayRenderQuality_2";
2715+
static const char * const k_pch_SteamVR_BlockOculusSDKOnOpenVRLaunchOption_Bool = "blockOculusSDKOnOpenVRLaunchOption";
2716+
static const char * const k_pch_SteamVR_BlockOculusSDKOnAllLaunches_Bool = "blockOculusSDKOnAllLaunches";
27032717

27042718
//-----------------------------------------------------------------------------
27052719
// direct mode keys
@@ -2878,6 +2892,7 @@ namespace vr
28782892
static const char* const k_pch_App_BindingPreviousURLSuffix_String = "PreviousURL";
28792893
static const char* const k_pch_App_NeedToUpdateAutosaveSuffix_Bool = "NeedToUpdateAutosave";
28802894
static const char* const k_pch_App_DominantHand_Int32 = "DominantHand";
2895+
static const char* const k_pch_App_BlockOculusSDK_Bool = "blockOculusSDK";
28812896

28822897
//-----------------------------------------------------------------------------
28832898
// configuration for trackers

headers/openvr_api.cs

+719-144
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)