Skip to content

Fix compile errors with XR subsystem #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2020
Merged

Fix compile errors with XR subsystem #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fdbe72
Fix compile error with XR SubsystemManager
fabien-unity Apr 13, 2020
8014f16
Merge branch 'HDRP/staging' into hdrp-xr-update-subsystem
sebastienlagarde Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed the debug exposure mode for display sky reflection and debug view baked lighting
- Fixed MSAA depth resolve when there is no motion vectors
- Fixed various object leaks in HDRP.
- Fixed compile error with XR SubsystemManager.

### Changed
- Color buffer pyramid is not allocated anymore if neither refraction nor distortion are enabled
Expand Down
10 changes: 10 additions & 0 deletions com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/XR/XRSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ internal XRSystem(RenderPipelineResources.ShaderResources shaders)
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSplashScreen)]
internal static void XRSystemInit()
{

#if UNITY_2020_2_OR_NEWER
SubsystemManager.GetSubsystems(displayList);
#else
SubsystemManager.GetInstances(displayList);
#endif

for (int i = 0; i < displayList.Count; i++)
{
Expand Down Expand Up @@ -161,7 +166,12 @@ internal void ReleaseFrame()
bool RefreshXrSdk()
{
#if ENABLE_VR && ENABLE_XR_MODULE

#if UNITY_2020_2_OR_NEWER
SubsystemManager.GetSubsystems(displayList);
#else
SubsystemManager.GetInstances(displayList);
#endif

if (displayList.Count > 0)
{
Expand Down