Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-11 00:15:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23797 - asajeffrey:webxr-framebuffer, r=Manishearth

Browse source 
Added framebuffer and related attributes to XRWebGLLayer

<!-- Please describe your changes on the following line: -->

Implement the `framebuffer` attribute of `XRWebGLLayer`.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes have tests

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23797)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-07-19 18:40:44 -04:00 • committed by GitHub
commit 1128f40f4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 249 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/wpt/metadata/MANIFEST.json
View file

@ -410535,6 +410535,12 @@
{}
]
],
"webxr/xrWebGLLayer_framebuffer.https.html": [
[
"webxr/xrWebGLLayer_framebuffer.https.html",
{}
]
],
"webxr/xrWebGLLayer_viewports.https.html": [
[
"webxr/xrWebGLLayer_viewports.https.html",
@ -688404,8 +688410,12 @@
"956edba98365d90eb180ad3c9697dae098bd25db",
"testharness"
],
"webxr/xrWebGLLayer_framebuffer.https.html": [
"7c4ff17c2547995afbf561850faaf92b6aa5e56f",
"testharness"
],
"webxr/xrWebGLLayer_viewports.https.html": [
"9553a445e43153b716d55c7f2be606dd548b808e",
"8cfccff3c01dedb41db4f26563824ce0cdb65ad3",
"testharness"
],
"workers/META.yml": [

9
tests/wpt/metadata/webxr/idlharness.https.window.js.ini
View file

@ -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

4
tests/wpt/metadata/webxr/xrWebGLLayer_framebuffer.https.html.ini Normal file
View file

@ -0,0 +1,4 @@
[xrWebGLLayer_framebuffer.https.html]
[XRWebGLLayer reports a valid framebuffer for inline sessions]
expected: FAIL

58
tests/wpt/web-platform-tests/webxr/xrWebGLLayer_framebuffer.https.html Normal file
View file

@ -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>

18
tests/wpt/web-platform-tests/webxr/xrWebGLLayer_viewports.https.html
View file

@ -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.