Fixed XR Layer rendering race condition with session initialization a…

…nd RenderState Update (#5489) * Fixed XR Layer rendering race condition with session initialization and RenderState update. * Execute enterVRSuccess after xrSession is fully initialized.
aframevr · Mar 8, 2024 · 77af389 · 77af389
1 parent a9a160b
commit 77af389
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/components/layer.js b/src/components/layer.js
@@ -367,7 +367,6 @@ module.exports.Component = registerComponent('layer', {
       return;
     }
     xrSession.requestReferenceSpace('local-floor').then(this.onRequestedReferenceSpace);
-    this.needsRedraw = true;
     this.layerEnabled = true;
     if (this.quadPanelEl) {
       this.quadPanelEl.object3D.visible = false;

diff --git a/src/core/scene/a-scene.js b/src/core/scene/a-scene.js
@@ -299,19 +299,18 @@ class AScene extends AEntity {
           self.usedOfferSession |= useOfferSession;
           requestSession(xrMode, xrInit).then(
             function requestSuccess (xrSession) {
-              self.xrSession = xrSession;
-
               if (useOfferSession) {
                 self.usedOfferSession = false;
               }
 
               vrManager.layersEnabled = xrInit.requiredFeatures.indexOf('layers') !== -1;
               vrManager.setSession(xrSession).then(function () {
                 vrManager.setFoveation(rendererSystem.foveationLevel);
+                self.xrSession = xrSession;
+                self.systems.renderer.setWebXRFrameRate(xrSession);
+                xrSession.addEventListener('end', self.exitVRBound);
+                enterVRSuccess(resolve);
               });
-              self.systems.renderer.setWebXRFrameRate(xrSession);
-              xrSession.addEventListener('end', self.exitVRBound);
-              enterVRSuccess(resolve);
             },
             function requestFail (error) {
               var useAR = xrMode === 'immersive-ar';