Updated to OpenVR SDK 1.11.11.

risa2000 · Apr 25, 2020 · f6c27aa · f6c27aa
1 parent 2471eba
commit f6c27aa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/api/openvr_api.json b/api/openvr_api.json
@@ -390,7 +390,6 @@
 	,{"name": "VREvent_DashboardDeactivated","value": "503"}
 	,{"name": "VREvent_DashboardRequested","value": "505"}
 	,{"name": "VREvent_ResetDashboard","value": "506"}
-	,{"name": "VREvent_RenderToast","value": "507"}
 	,{"name": "VREvent_ImageLoaded","value": "508"}
 	,{"name": "VREvent_ShowKeyboard","value": "509"}
 	,{"name": "VREvent_HideKeyboard","value": "510"}
@@ -449,6 +448,8 @@
 	,{"name": "VREvent_LastKnownSectionSettingChanged","value": "867"}
 	,{"name": "VREvent_DismissedWarningsSectionSettingChanged","value": "868"}
 	,{"name": "VREvent_GpuSpeedSectionSettingChanged","value": "869"}
+	,{"name": "VREvent_WindowsMRSectionSettingChanged","value": "870"}
+	,{"name": "VREvent_OtherSectionSettingChanged","value": "871"}
 	,{"name": "VREvent_StatusUpdate","value": "900"}
 	,{"name": "VREvent_WebInterface_InstallDriverCompleted","value": "950"}
 	,{"name": "VREvent_MCImageUpdated","value": "1000"}
@@ -1108,6 +1109,13 @@
 	,{"name": "VRRenderModelError_NotEnoughTexCoords","value": "308"}
 	,{"name": "VRRenderModelError_InvalidTexture","value": "400"}
 ]}
+,	{"enumname": "vr::EVRRenderModelTextureFormat","values": [ 
+	{"name": "VRRenderModelTextureFormat_RGBA8_SRGB","value": "0"}
+	,{"name": "VRRenderModelTextureFormat_BC2","value": "1"}
+	,{"name": "VRRenderModelTextureFormat_BC4","value": "2"}
+	,{"name": "VRRenderModelTextureFormat_BC7","value": "3"}
+	,{"name": "VRRenderModelTextureFormat_BC7_SRGB","value": "4"}
+]}
 ,	{"enumname": "vr::EVRNotificationType","values": [ 
 	{"name": "EVRNotificationType_Transient","value": "0"}
 	,{"name": "EVRNotificationType_Persistent","value": "1"}
@@ -1532,6 +1540,8 @@
 	"constname": "k_pch_Null_SecondsFromVsyncToPhotons_Float","consttype": "const char *const", "constval": "secondsFromVsyncToPhotons"}
 ,{
 	"constname": "k_pch_Null_DisplayFrequency_Float","consttype": "const char *const", "constval": "displayFrequency"}
+,{
+	"constname": "k_pch_WindowsMR_Section","consttype": "const char *const", "constval": "driver_holographic"}
 ,{
 	"constname": "k_pch_UserInterface_Section","consttype": "const char *const", "constval": "userinterface"}
 ,{
@@ -1588,6 +1598,8 @@
 	"constname": "k_pch_CollisionBounds_PlaySpaceOn_Bool","consttype": "const char *const", "constval": "CollisionBoundsPlaySpaceOn"}
 ,{
 	"constname": "k_pch_CollisionBounds_FadeDistance_Float","consttype": "const char *const", "constval": "CollisionBoundsFadeDistance"}
+,{
+	"constname": "k_pch_CollisionBounds_WallHeight_Float","consttype": "const char *const", "constval": "CollisionBoundsWallHeight"}
 ,{
 	"constname": "k_pch_CollisionBounds_ColorGammaR_Int32","consttype": "const char *const", "constval": "CollisionBoundsColorGammaR"}
 ,{
@@ -1646,6 +1658,10 @@
 	"constname": "k_pch_audio_PlaybackMirrorDeviceName_String","consttype": "const char *const", "constval": "playbackMirrorDeviceName"}
 ,{
 	"constname": "k_pch_audio_OldPlaybackMirrorDevice_String","consttype": "const char *const", "constval": "onPlaybackMirrorDevice"}
+,{
+	"constname": "k_pch_audio_ActiveMirrorDevice_String","consttype": "const char *const", "constval": "activePlaybackMirrorDevice"}
+,{
+	"constname": "k_pch_audio_EnablePlaybackMirrorIndependentVolume_Bool","consttype": "const char *const", "constval": "enablePlaybackMirrorIndependentVolume"}
 ,{
 	"constname": "k_pch_audio_LastHmdPlaybackDeviceId_String","consttype": "const char *const", "constval": "lastHmdPlaybackDeviceId"}
 ,{
@@ -1670,8 +1686,6 @@
 	"constname": "k_pch_Dashboard_EnableDashboard_Bool","consttype": "const char *const", "constval": "enableDashboard"}
 ,{
 	"constname": "k_pch_Dashboard_ArcadeMode_Bool","consttype": "const char *const", "constval": "arcadeMode"}
-,{
-	"constname": "k_pch_Dashboard_UseWebSettings","consttype": "const char *const", "constval": "useWebSettings"}
 ,{
 	"constname": "k_pch_Dashboard_Position","consttype": "const char *const", "constval": "position"}
 ,{
@@ -2117,7 +2131,8 @@
 ,{"struct": "vr::RenderModel_TextureMap_t","fields": [
 { "fieldname": "unWidth", "fieldtype": "uint16_t"},
 { "fieldname": "unHeight", "fieldtype": "uint16_t"},
-{ "fieldname": "rubTextureMapData", "fieldtype": "const uint8_t *"}]}
+{ "fieldname": "rubTextureMapData", "fieldtype": "const uint8_t *"},
+{ "fieldname": "format", "fieldtype": "enum vr::EVRRenderModelTextureFormat"}]}
 ,{"struct": "vr::RenderModel_t","fields": [
 { "fieldname": "rVertexData", "fieldtype": "const struct vr::RenderModel_Vertex_t *"},
 { "fieldname": "unVertexCount", "fieldtype": "uint32_t"},

diff --git a/hmdq/CMakeLists.txt b/hmdq/CMakeLists.txt
@@ -91,20 +91,13 @@ set (hmdq_sources
     ${PROJECT_BINARY_DIR}/hmdq.rc
     )
 
-# mangle the lib name for Clang build
-if (${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
-    set (OPENVRLIB openvr_api64c)
-else()
-    set (OPENVRLIB openvr_api64)
-endif()
-
 # set the path to OVR_SDK
 if (NOT OVR_SDK)
     set (OVR_SDK $ENV{OVR_SDK})
 endif()
 
 # 3rd party libs (linked as .lib, but needed as .dll in DLL CRT linkage)
-set (EXT_LIBS botan ${OPENVRLIB})
+set (EXT_LIBS botan openvr_api64)
 
 # Add sources to `hmdq` executable.
 add_executable (hmdq)