Added wpt webxr tests for XR layer's viewports and framebuffer

servo · Jul 18, 2019 · f2766cf · f2766cf
1 parent aa0a72d
commit f2766cf
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 12 deletions.
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
@@ -410359,6 +410359,12 @@
      {}
     ]
    ],
+   "webxr/xrWebGLLayer_framebuffer.https.html": [
+    [
+     "webxr/xrWebGLLayer_framebuffer.https.html",
+     {}
+    ]
+   ],
    "webxr/xrWebGLLayer_viewports.https.html": [
     [
      "webxr/xrWebGLLayer_viewports.https.html",
@@ -688112,8 +688118,12 @@
    "956edba98365d90eb180ad3c9697dae098bd25db",
    "testharness"
   ],
+  "webxr/xrWebGLLayer_framebuffer.https.html": [
+   "7c4ff17c2547995afbf561850faaf92b6aa5e56f",
+   "testharness"
+  ],
   "webxr/xrWebGLLayer_viewports.https.html": [
-   "9553a445e43153b716d55c7f2be606dd548b808e",
+   "8cfccff3c01dedb41db4f26563824ce0cdb65ad3",
    "testharness"
   ],
   "workers/META.yml": [

diff --git a/tests/wpt/metadata/webxr/idlharness.https.window.js.ini b/tests/wpt/metadata/webxr/idlharness.https.window.js.ini
@@ -86,9 +86,6 @@
   [XRSessionEvent interface object name]
     expected: FAIL
 
-  [XRWebGLLayer interface: attribute framebufferHeight]
-    expected: FAIL
-
   [XRInputSourceEvent interface: attribute inputSource]
     expected: FAIL
 
@@ -128,9 +125,6 @@
   [XRRay interface object name]
     expected: FAIL
 
-  [XRWebGLLayer interface: attribute framebufferWidth]
-    expected: FAIL
-
   [XRInputSourceArray interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
@@ -236,9 +230,6 @@
   [XRInputSourceArray interface: existence and properties of interface prototype object's "constructor" property]
     expected: FAIL
 
-  [XRWebGLLayer interface: attribute framebuffer]
-    expected: FAIL
-
   [XRInputSourceEvent interface object length]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer.https.html.ini b/tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer.https.html.ini
@@ -0,0 +1,4 @@
+[xrWebGLLayer_framebuffer.https.html]
+  [XRWebGLLayer reports a valid framebuffer for inline sessions]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer.https.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/webxr_test_constants.js"></script>
+<script src="resources/webxr_util.js"></script>
+<canvas></canvas>
+
+<script>
+
+let immersiveTestName = "XRWebGLLayer reports a valid framebuffer for immersive sessions";
+let inlineTestName = "XRWebGLLayer reports a valid framebuffer for inline sessions";
+
+let fakeDeviceInitParams = TRACKED_IMMERSIVE_DEVICE;
+
+let testFunction = function(session, fakeDeviceController, t) {
+  return session.requestReferenceSpace('viewer')
+      .then((space) => new Promise((resolve) => {
+    function onFrame(time, xrFrame) {
+      let layer = xrFrame.session.renderState.baseLayer;
+      let gl = layer.context;
+
+      // The layer's framebuffer is a WebGL framebuffer
+      assert_not_equals(layer.framebuffer, null);
+      assert_true(layer.framebuffer instanceof WebGLFramebuffer);
+
+      // The XR framebuffer is not bound to the GL context by default.
+      assert_not_equals(layer.framebuffer, gl.getParameter(gl.FRAMEBUFFER_BINDING));
+
+      // The XR framebuffer can be bound to the GL context.
+      gl.bindFramebuffer(gl.FRAMEBUFFER, layer.framebuffer);
+      assert_equals(layer.framebuffer, gl.getParameter(gl.FRAMEBUFFER_BINDING));
+
+      // The XR framebuffer has a 2D texture
+      let attachment = gl.getFramebufferAttachmentParameter(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE);
+      assert_equals(attachment, gl.TEXTURE);
+
+      // Check that each viewport fits inside the framebuffer dimensions
+      let viewer_pose = xrFrame.getViewerPose(space);
+      for (view of viewer_pose.views) {
+        let viewport = layer.getViewport(view);
+        assert_less_than_equal(viewport.x + viewport.width, layer.framebufferWidth);
+        assert_less_than_equal(viewport.y + viewport.height, layer.framebufferHeight);
+      }
+
+      // Finished test.
+      resolve();
+    }
+
+    session.requestAnimationFrame(onFrame);
+  }));
+};
+
+xr_session_promise_test(immersiveTestName, testFunction,
+  fakeDeviceInitParams, 'immersive-vr');
+xr_session_promise_test(inlineTestName, testFunction,
+  fakeDeviceInitParams, 'inline');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html
@@ -22,6 +22,8 @@
       let layer = xrFrame.session.renderState.baseLayer;
       for (view of viewer_pose.views) {
         let viewport = layer.getViewport(view);
+        let index = (view.eye === "right"? 1: 0);
+        let params = fakeDeviceInitParams.views[index];
 
         // Ensure the returned object is an XRViewport object
         assert_not_equals(viewport, null);
@@ -30,8 +32,20 @@
         // Ensure the viewport dimensions are valid
         assert_greater_than_equal(viewport.x, 0);
         assert_greater_than_equal(viewport.y, 0);
-        assert_greater_than_equal(viewport.width, 1);
-        assert_greater_than_equal(viewport.height, 1);
+        assert_equals(viewport.width, params.resolution.width);
+        assert_equals(viewport.height, params.resolution.height);
+
+        // Ensure none of the viewports overlap
+        for (other of viewer_pose.views) {
+          if (view !== other) {
+            let otherport = layer.getViewport(other);
+            let no_overlap = (viewport.x + viewport.width <= otherport.x) ||
+              (otherport.x + otherport.width <= viewport.x) ||
+              (viewport.y + viewport.height <= otherport.y) ||
+              (otherport.y + otherport.height <= viewport.y);
+            assert_true(no_overlap, "Overlap between viewport " + view.eye + " and " + other.eye);
+          }
+        }
       }
 
       // Finished test.