From f2766cf6f34030c177586cfef2d1d054bd2b5a36 Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Thu, 18 Jul 2019 11:00:16 -0500 Subject: [PATCH] Added wpt webxr tests for XR layer's viewports and framebuffer --- tests/wpt/metadata/MANIFEST.json | 12 +++- .../webxr/idlharness.https.window.js.ini | 9 --- .../xrWebGLLayer_framebuffer.https.html.ini | 4 ++ .../webxr/xrWebGLLayer_framebuffer.https.html | 58 +++++++++++++++++++ .../webxr/xrWebGLLayer_viewports.https.html | 18 +++++- 5 files changed, 89 insertions(+), 12 deletions(-) create mode 100644 tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer.https.html.ini create mode 100644 tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer.https.html diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index 0b1df3155f9..9dea0607a71 100644 --- 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 index 17bdd9d9913..b3906bc63f5 100644 --- 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 new file mode 100644 index 00000000000..0b342979202 --- /dev/null +++ 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 new file mode 100644 index 00000000000..7c4ff17c254 --- /dev/null +++ b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer.https.html @@ -0,0 +1,58 @@ + + + + + + + + diff --git a/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html b/tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html index 9553a445e43..8cfccff3c01 100644 --- 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 testFunction = function(session, fakeDeviceController, t) { 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 @@ let testFunction = function(session, fakeDeviceController, t) { // 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.