Merge pull request #1330 from exokitxr/sync-contextless

Sync contextless 2d iframes

Author: Avaer Kazmer

deps/exokit-bindings/egl/src/egl.cc

@@ -115,6 +115,18 @@ void SetCurrentWindowContext(NATIVEwindow *window) {
   }
 } */
 
+NAN_METHOD(HasCurrentWindowContext) {
+  info.GetReturnValue().Set(JS_BOOL(currentWindow != nullptr));
+}
+
+NAN_METHOD(GetCurrentWindowContext) {
+  if (currentWindow != nullptr) {
+    info.GetReturnValue().Set(pointerToArray(currentWindow));
+  } else {
+    info.GetReturnValue().Set(Nan::Null());
+  }
+}
+
 NAN_METHOD(SetCurrentWindowContext) {
   NATIVEwindow *window = (NATIVEwindow *)arrayToPointer(Local<Array>::Cast(info[0]));
   SetCurrentWindowContext(window);
@@ -422,6 +434,8 @@ Local<Object> makeWindow() {
   Nan::SetMethod(target, "setClipboard", egl::SetClipboard);
   Nan::SetMethod(target, "blitTopFrameBuffer", egl::BlitTopFrameBuffer);
   Nan::SetMethod(target, "blitChildFrameBuffer", egl::BlitChildFrameBuffer);
+  Nan::SetMethod(target, "hasCurrentWindowContext", egl::HasCurrentWindowContext);
+  Nan::SetMethod(target, "getCurrentWindowContext", egl::GetCurrentWindowContext);
   Nan::SetMethod(target, "setCurrentWindowContext", egl::SetCurrentWindowContext);
 
   return scope.Escape(target);

deps/exokit-bindings/glfw/src/glfw.cc

@@ -942,6 +942,18 @@ void ReadPixels(WebGLRenderingContext *gl, unsigned int fbo, int x, int y, int w
   }
 }
 
+NAN_METHOD(HasCurrentWindowContext) {
+  info.GetReturnValue().Set(JS_BOOL(currentWindow != nullptr));
+}
+
+NAN_METHOD(GetCurrentWindowContext) {
+  if (currentWindow != nullptr) {
+    info.GetReturnValue().Set(pointerToArray(currentWindow));
+  } else {
+    info.GetReturnValue().Set(Nan::Null());
+  }
+}
+
 NAN_METHOD(SetCurrentWindowContext) {
   NATIVEwindow *window = (NATIVEwindow *)arrayToPointer(Local<Array>::Cast(info[0]));
   SetCurrentWindowContext(window);
@@ -1758,6 +1770,8 @@ Local<Object> makeWindow() {
   Nan::SetMethod(target, "setClipboard", glfw::SetClipboard);
   Nan::SetMethod(target, "blitTopFrameBuffer", glfw::BlitTopFrameBuffer);
   Nan::SetMethod(target, "blitChildFrameBuffer", glfw::BlitChildFrameBuffer);
+  Nan::SetMethod(target, "hasCurrentWindowContext", glfw::HasCurrentWindowContext);
+  Nan::SetMethod(target, "getCurrentWindowContext", glfw::GetCurrentWindowContext);
   Nan::SetMethod(target, "setCurrentWindowContext", glfw::SetCurrentWindowContext);
 #ifdef MAIN_THREAD_POLLING
   Nan::SetMethod(target, "pollEvents", glfw::PollEvents);

src/Window.js

@@ -1000,15 +1000,20 @@ const _makeRequestAnimationFrame = window => (fn, priority = 0) => {
   const _waitLocalSyncs = syncs => {
     if (vrPresentState.glContext) {
       nativeWindow.setCurrentWindowContext(vrPresentState.glContext.getWindowHandle());
-
       for (let i = 0; i < syncs.length; i++) {
         const sync = syncs[i];
         nativeWindow.waitSync(sync);
         prevSyncs.push(sync);
       }
+      return [];
     } else {
-      for (let i = 0; i < syncs.length; i++) {
-        nativeWindow.deleteSync(syncs[i]);
+      if (nativeWindow.hasCurrentWindowContext()) {
+        for (let i = 0; i < syncs.length; i++) {
+          nativeWindow.deleteSync(syncs[i]);
+        }
+        return [];
+      } else {
+        return syncs;
       }
     }
   };
@@ -1118,12 +1123,13 @@ const _makeRequestAnimationFrame = window => (fn, priority = 0) => {
       }
     }
 
-    return Promise.resolve(syncs);
+    return syncs;
   };
   const _renderLocal = (syncs, layered) => {
-    _waitLocalSyncs(syncs);
+    syncs = _waitLocalSyncs(syncs);
     _tickLocalRafs();
-    return _composeLocalLayers(layered);
+    syncs.push.apply(syncs, _composeLocalLayers(layered));
+    return Promise.resolve(syncs);
   };
   const _makeRenderChild = window => (syncs, layered) => window.runAsync({
     method: 'tickAnimationFrame',