From 4088fc07875e0655434867d9a52d6f3920e594c4 Mon Sep 17 00:00:00 2001 From: madsbuvi Date: Wed, 10 Mar 2021 17:05:23 +0100 Subject: [PATCH] Default disable composition layer depth until i either figure out what i'm doing wrong, or steamvr fixes whatever they're doing wrong. --- apps/openmw/mwvr/openxrplatform.cpp | 6 +++--- files/settings-default.cfg | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/openmw/mwvr/openxrplatform.cpp b/apps/openmw/mwvr/openxrplatform.cpp index 878a71dc8..21a32873f 100644 --- a/apps/openmw/mwvr/openxrplatform.cpp +++ b/apps/openmw/mwvr/openxrplatform.cpp @@ -55,8 +55,6 @@ namespace MWVR ss << sourceLocation << ": OpenXR[Error: " << resultString << "][Thread: " << std::this_thread::get_id() << "]: " << originator; #endif Log(Debug::Error) << ss.str(); - if (res == XR_ERROR_TIME_INVALID) - Log(Debug::Error) << "Breakpoint"; if (!sContinueOnErrors) throw std::runtime_error(ss.str().c_str()); } @@ -246,12 +244,14 @@ namespace MWVR void OpenXRPlatform::setupExtensions() { std::vector optionalExtensions = { - XR_KHR_COMPOSITION_LAYER_DEPTH_EXTENSION_NAME, XR_EXT_HP_MIXED_REALITY_CONTROLLER_EXTENSION_NAME, XR_HTC_VIVE_COSMOS_CONTROLLER_INTERACTION_EXTENSION_NAME, XR_HUAWEI_CONTROLLER_INTERACTION_EXTENSION_NAME }; + if (Settings::Manager::getBool("enable XR_KHR_composition_layer_depth", "VR Debug")) + optionalExtensions.emplace_back(XR_KHR_COMPOSITION_LAYER_DEPTH_EXTENSION_NAME); + if (Settings::Manager::getBool("enable XR_EXT_debug_utils", "VR Debug")) optionalExtensions.emplace_back(XR_EXT_DEBUG_UTILS_EXTENSION_NAME); diff --git a/files/settings-default.cfg b/files/settings-default.cfg index e14f22877..0cfc13147 100644 --- a/files/settings-default.cfg +++ b/files/settings-default.cfg @@ -1090,6 +1090,11 @@ continue on errors = true # If true, enable openxr debug functionality via the XR_EXT_debug_utils extension enable XR_EXT_debug_utils = false +# If true, enable composition layer depth functionality via the XR_KHR_composition_layer_depth extension +# This defaults to false because either my implementation is borked or some runtimes' are. +# It'll stay in settings jail until i figure it out. +enable XR_KHR_composition_layer_depth = false + # Enable/disable openxr debug message levels XR_EXT_debug_utils message level verbose = false XR_EXT_debug_utils message level info = true