Skip to content

GitLab

T
tangled
Commit 61d65080 authored by Alex Cooper's avatar Alex Cooper Committed by Commit Bot
Browse files
Options

Consolidate xrWebGLLayer_framebuffer tests 

xrWebGLLayer_framebuffer was a recently added test that both duplicated
and was at odds with parts of xrWebGLLayer_opaque_framebuffer. This
change deletes xrWebGLLayer_framebuffer and ports the new requirements
from that file that are spec compliant to the opaque_framebuffer file.

Bug: 986672
Change-Id: I0f649297f2d4f93f2d17cb396185436e7cb7c6bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1727329
Commit-Queue: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Brandon Jones <bajones@chromium.org>
Auto-Submit: Alexander Cooper <alcooper@chromium.org>
Reviewed-by: default avatarBrandon Jones <bajones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682477}
parent bb33f8cf
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 74 deletions
third_party/blink/web_tests/external/wpt/webxr/xrWebGLLayer_framebuffer.https-expected.txt deleted 100644 → 0
View file @ bb33f8cf
This is a testharness.js-based test.
FAIL XRWebGLLayer reports a valid framebuffer for immersive sessions assert_equals: expected (number) 5890 but got (object) null
FAIL XRWebGLLayer reports a valid framebuffer for inline sessions assert_not_equals: got disallowed value null
Harness: the test ran to completion.
third_party/blink/web_tests/external/wpt/webxr/xrWebGLLayer_framebuffer.https.html deleted 100644 → 0
View file @ bb33f8cf
<!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
t.step(() => {
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);
t.step(() => {
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);
t.step(() => {
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);
t.step(() => {
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>
third_party/blink/web_tests/external/wpt/webxr/xrWebGLLayer_opaque_framebuffer.https.html
View file @ 61d65080
......@@ -31,6 +31,10 @@ let testFunction =
}
assert_not_equals(xrFramebuffer, null);
// The XR framebuffer is not bound to the GL context by default.
assert_not_equals(xrFramebuffer, gl.getParameter(gl.FRAMEBUFFER_BINDING));
assert_greater_than(webglLayer.framebufferWidth, 0);
assert_greater_than(webglLayer.framebufferHeight, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment