From f838e06c515ec45aeec165e4a5a64bade408b20a Mon Sep 17 00:00:00 2001
From: fqamic <fqamic@vip.qq.com>
Date: Wed, 14 Sep 2022 17:33:51 +0800
Subject: [PATCH] improve: move xr init to infrastructure (#12765)

* improve: move xr init to infrastructure

* fix: move initxr, before gfx

* fix: format warning
---
 cocos/core/game.ts | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/cocos/core/game.ts b/cocos/core/game.ts
index 5a1fba10fd7..d778fdd6094 100644
--- a/cocos/core/game.ts
+++ b/cocos/core/game.ts
@@ -686,17 +686,6 @@ export class Game extends EventTarget {
                 if (DEBUG) {
                     console.timeEnd('Init Base');
                 }
-
-                if (sys.isXR) {
-                    // XrEntry must not be destroyed
-                    xr.entry = xr.XrEntry.getInstance();
-
-                    const xrMSAA = settings.querySettings(Settings.Category.RENDERING, 'msaa') ?? 1;
-                    const xrRenderingScale = settings.querySettings(Settings.Category.RENDERING, 'renderingScale') ?? 1.0;
-                    xr.entry.setMultisamplesRTT(xrMSAA);
-                    xr.entry.setRenderingScale(xrRenderingScale);
-                }
-
                 this.emit(Game.EVENT_POST_BASE_INIT);
                 return this.onPostBaseInitDelegate.dispatch();
             })
@@ -711,6 +700,7 @@ export class Game extends EventTarget {
                     console.time('Init Infrastructure');
                 }
                 macro.init();
+                this._initXR();
                 const adapter = findCanvas();
                 if (adapter) {
                     this.canvas = adapter.canvas;
@@ -805,6 +795,18 @@ export class Game extends EventTarget {
             });
     }
 
+    private _initXR () {
+        if (sys.isXR) {
+            // XrEntry must not be destroyed
+            xr.entry = xr.XrEntry.getInstance();
+
+            const xrMSAA = settings.querySettings(Settings.Category.RENDERING, 'msaa') ?? 1;
+            const xrRenderingScale = settings.querySettings(Settings.Category.RENDERING, 'renderingScale') ?? 1.0;
+            xr.entry.setMultisamplesRTT(xrMSAA);
+            xr.entry.setRenderingScale(xrRenderingScale);
+        }
+    }
+
     private _compatibleWithOldParams (config: IGameConfig) {
         const overrideSettings = config.overrideSettings = config.overrideSettings || {};
         if ('showFPS' in config) {