Skip to content

test: cleanup XRUtility before upgrading Graphics Test Framework #854

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
sindharta merged 2 commits into from
Jun 24, 2026
Merged

test: cleanup XRUtility before upgrading Graphics Test Framework #854

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59f2e74
cleanup XR Utiolity
sindharta Jun 24, 2026
a84b984
change the order
sindharta Jun 24, 2026
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
37 changes: 23 additions & 14 deletions com.unity.toon-graphics-test/Runtime/XRUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,26 @@ public static void EnableXRInEditor() {
"Assets/XR/XRGeneralSettingsPerBuildTarget.asset");
}


XRManagerSettings xrManager = XRGeneralSettings.Instance.Manager;
Comment thread
sindharta-tanuwijaya marked this conversation as resolved.

//Disable everything first
if (XRGeneralSettings.Instance.Manager.activeLoader ||
XRGeneralSettings.Instance.Manager.isInitializationComplete)
if (xrManager.activeLoader ||
xrManager.isInitializationComplete)
Comment thread
sindharta-tanuwijaya marked this conversation as resolved.
{
DisableXR();
}

if (!XRGeneralSettings.Instance.Manager.activeLoader) {
XRGeneralSettings.Instance.Manager.InitializeLoaderSync();
XRGeneralSettings.Instance.InitManagerOnStart = true;
if (!xrManager.activeLoader) {
xrManager.InitializeLoaderSync();
}


if (XRGeneralSettings.Instance.Manager.activeLoader
&& XRGeneralSettings.Instance.Manager.isInitializationComplete)
if (xrManager.activeLoader
&& xrManager.isInitializationComplete)
{
XRGeneralSettings.Instance.Manager.StartSubsystems();
xrManager.StartSubsystems();
}

List<XRDisplaySubsystem> xrDisplaySubsystems = new List<XRDisplaySubsystem>();
Expand All @@ -50,14 +54,19 @@ public static void EnableXRInEditor() {

public static void DisableXR() {

XRManagerSettings xrManager = XRGeneralSettings.Instance?.Manager;
if (null!= xrManager && xrManager.isInitializationComplete)
{
xrManager.StopSubsystems();
xrManager.DeinitializeLoader();
XRGeneralSettings xrInstance = XRGeneralSettings.Instance;
if (null != xrInstance) {
xrInstance.InitManagerOnStart = false;

XRManagerSettings xrManager = xrInstance.Manager;
if (null!= xrManager && xrManager.isInitializationComplete)
Comment thread
sindharta-tanuwijaya marked this conversation as resolved.
{
xrManager.StopSubsystems();
xrManager.DeinitializeLoader();
}
Comment thread
sindharta-tanuwijaya marked this conversation as resolved.

}



List<XRDisplaySubsystem> xrDisplaySubsystems = new List<XRDisplaySubsystem>();
SubsystemManager.GetSubsystems<XRDisplaySubsystem>(xrDisplaySubsystems);
int count = xrDisplaySubsystems.Count;
Expand Down