Mostly remove the use of the OPENXR ifdef #16344
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
…build on Windows.
unknownbrackets
approved these changes
Nov 6, 2022
Comment on lines
311
to
314
| // Unsupported in VR at the moment | ||
| if (IsVRBuild()) { | ||
| if (IsVREnabled()) { | ||
| return false; | ||
| } |
There was a problem hiding this comment.
Although fine for now, I think it'll end up making sense to reverse this onto where VR is configured (until VR is available with Vulkan.)
-[Unknown]
There was a problem hiding this comment.
Yes, this is just a minimal step, how configuration works will be redone later.
|
|
||
| #ifdef XR_NO_PROTOTYPES | ||
|
|
||
| PFN_xrGetInstanceProcAddr xrGetInstanceProcAddr; |
There was a problem hiding this comment.
nit: Prefer spaces for alignment, h too...?
-[Unknown]
lvonasek
approved these changes
Nov 6, 2022
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.
That is, build all the VR code regardless of platform. This is a first step towards making it possible to autodetect and use OpenXR dynamically on Windows - we don't want to build a separate exe or something like that.
This required adding a new dynamic OpenXR loader, so that things can link even when we're not using the static loaders provided by the headset makers.
The new dynamic loader is entirely untested but should work - if not I'll fix it when we actually start doing VR on desktop. In any case, it fixes linking.