[OpenXR] Fixes crashes when no device is present #2121
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The essential part here is that `OpenXRHmd.CanInitialize` will now return false if no device is present. This ensures that the `VRDeviceSystem` sets up a dummy device which in turn prevents many parts from crashing. To truly know whether or not an actual device is connected we first need to establish contact with the OpenXR runtime. Therefor code has been moved around a bit to be able to call various parts individually. Tested on two machines, one without any VR related things installed and another one with an actual device. This commit also contains a bunch of code cleanups: - Enables C# nullable feature on OpenXR files - Adds null checks to various places - Disposes XR API after shutting down the device - Makes various fields and methods private - Moves initialization code to a `OpenXRUtils` class to make dependencies more visible - Turns OpenXRInput into a normal class holding a reference to the device - Turns `CheckResult` into a extension method and simplifies its usage by letting C# infer the called method - Introduced `OpenXRException` exception class carrying the inferred method and XR error code
8 tasks
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Details
The essential part here is that
OpenXRHmd.CanInitializewill now return false if no device is present. This ensures that theVRDeviceSystemsets up a dummy device which in turn prevents many parts from crashing.Description
To truly know whether or not an actual device is connected we first need to establish contact with the OpenXR runtime. Therefor code has been moved around a bit to be able to call various parts individually. Tested on two machines, one without any VR related things installed and another one with an actual device.
This commit also contains a bunch of code cleanups:
OpenXRUtilsclass to make dependencies more visibleOpenXRInputinto a normal class holding a reference to the deviceCheckResultinto an extension method and simplifies its usage by letting C# infer the called methodOpenXRExceptionexception class carrying the inferred method and XR error codeRelated Issue
Probably causes conflicts with #2119 which we would offer to fix.
Motivation and Context
The system shouldn't crash when no VR device is present.
Types of changes
Checklist