Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add more cases to canvas reftest with device loss #3715

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add more cases to canvas reftest with device loss #3715

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ada6541
Add cases that redraw without reconfiguring
kainino0x Apr 24, 2024
b60b28c
Add cases that unconfigure before lost
kainino0x Apr 25, 2024
de5f2e3
add comment about assert
kainino0x May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 69 additions & 28 deletions src/webgpu/web_platform/reftests/canvas_display_after_device_lost.html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,83 @@ void (async () => {
const presentationFormat = navigator.gpu.getPreferredCanvasFormat();
let deviceLost = false;

function draw(canvasId: string, alphaMode: GPUCanvasAlphaMode, abortAfterDeviceLost: boolean) {
if (deviceLost && abortAfterDeviceLost) {
return;
function draw(
canvasId: string,
alphaMode: GPUCanvasAlphaMode,
{
unconfigureBeforeLost,
reconfigureAfterLost,
drawAfterLost,
}: {
unconfigureBeforeLost: boolean;
reconfigureAfterLost: boolean;
drawAfterLost: boolean;
}

) {
const canvas = document.getElementById(canvasId) as HTMLCanvasElement;
const ctx = canvas.getContext('webgpu') as unknown as GPUCanvasContext;
ctx.configure({
device,
format: presentationFormat,
alphaMode,
});
if (!deviceLost || reconfigureAfterLost) {
ctx.configure({ device, format: presentationFormat, alphaMode });
}

if (!deviceLost || drawAfterLost) {
let threw;
try {
const colorAttachment = ctx.getCurrentTexture();
threw = false;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not initialize threw to false instead of setting it here?

const colorAttachmentView = colorAttachment.createView();

const colorAttachment = ctx.getCurrentTexture();
const colorAttachmentView = colorAttachment.createView();
const encoder = device.createCommandEncoder();
const pass = encoder.beginRenderPass({
colorAttachments: [
{
view: colorAttachmentView,
clearValue: { r: 0.4, g: 1.0, b: 0.0, a: 1.0 },
loadOp: 'clear',
storeOp: 'store',
},
],
});
pass.end();
device.queue.submit([encoder.finish()]);
} catch (ex) {
threw = true;
}

assert(
kainino0x marked this conversation as resolved.
Show resolved Hide resolved
threw === (deviceLost && unconfigureBeforeLost && !reconfigureAfterLost),
'getCurrentTexture() should throw iff the canvas is unconfigured'
);
}

const encoder = device.createCommandEncoder();
const pass = encoder.beginRenderPass({
colorAttachments: [
{
view: colorAttachmentView,
clearValue: { r: 0.4, g: 1.0, b: 0.0, a: 1.0 },
loadOp: 'clear',
storeOp: 'store',
},
],
});
pass.end();
device.queue.submit([encoder.finish()]);
if (!deviceLost && unconfigureBeforeLost) {
ctx.unconfigure();
}
}

function drawAll() {
draw('cvs0', 'opaque', true);
draw('cvs1', 'opaque', false);
draw('cvs2', 'premultiplied', true);
draw('cvs3', 'premultiplied', false);
/* prettier-ignore */
{
draw('cvs00', 'opaque', { unconfigureBeforeLost: false, reconfigureAfterLost: false, drawAfterLost: false });
draw('cvs01', 'opaque', { unconfigureBeforeLost: false, reconfigureAfterLost: false, drawAfterLost: true });
draw('cvs02', 'premultiplied', { unconfigureBeforeLost: false, reconfigureAfterLost: false, drawAfterLost: false });
draw('cvs03', 'premultiplied', { unconfigureBeforeLost: false, reconfigureAfterLost: false, drawAfterLost: true });

draw('cvs10', 'opaque', { unconfigureBeforeLost: false, reconfigureAfterLost: true, drawAfterLost: false });
draw('cvs11', 'opaque', { unconfigureBeforeLost: false, reconfigureAfterLost: true, drawAfterLost: true });
draw('cvs12', 'premultiplied', { unconfigureBeforeLost: false, reconfigureAfterLost: true, drawAfterLost: false });
draw('cvs13', 'premultiplied', { unconfigureBeforeLost: false, reconfigureAfterLost: true, drawAfterLost: true });

draw('cvs20', 'opaque', { unconfigureBeforeLost: true, reconfigureAfterLost: false, drawAfterLost: false });
draw('cvs21', 'opaque', { unconfigureBeforeLost: true, reconfigureAfterLost: false, drawAfterLost: true });
draw('cvs22', 'premultiplied', { unconfigureBeforeLost: true, reconfigureAfterLost: false, drawAfterLost: false });
draw('cvs23', 'premultiplied', { unconfigureBeforeLost: true, reconfigureAfterLost: false, drawAfterLost: true });

draw('cvs30', 'opaque', { unconfigureBeforeLost: true, reconfigureAfterLost: true, drawAfterLost: false });
draw('cvs31', 'opaque', { unconfigureBeforeLost: true, reconfigureAfterLost: true, drawAfterLost: true });
draw('cvs32', 'premultiplied', { unconfigureBeforeLost: true, reconfigureAfterLost: true, drawAfterLost: false });
draw('cvs33', 'premultiplied', { unconfigureBeforeLost: true, reconfigureAfterLost: true, drawAfterLost: true });
}

if (!deviceLost) {
device.destroy();
Expand Down
24 changes: 20 additions & 4 deletions src/webgpu/web_platform/reftests/canvas_display_after_device_lost.https.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,26 @@
<link rel="match" href="./ref/canvas_display_after_device_lost-ref.html" />
<style>
body { background-color: #F0E68C; }
canvas { border: 1px solid white; }
</style>
<canvas id="cvs0" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs1" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs2" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs3" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs00" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs01" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs02" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs03" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<br>
<canvas id="cvs10" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs11" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs12" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs13" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<br>
<canvas id="cvs20" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs21" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs22" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs23" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<br>
<canvas id="cvs30" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs31" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs32" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs33" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<script type="module" src="canvas_display_after_device_lost.html.js"></script>
</html>
47 changes: 39 additions & 8 deletions src/webgpu/web_platform/reftests/ref/canvas_display_after_device_lost-ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,27 @@
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<style>
body { background-color: #F0E68C; }
canvas { border: 1px solid white; }
</style>
<canvas id="cvs0" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs1" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs2" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs3" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs00" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs01" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs02" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs03" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<br>
<canvas id="cvs10" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs11" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs12" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs13" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<br>
<canvas id="cvs20" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs21" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs22" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs23" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<br>
<canvas id="cvs30" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs31" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs32" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs33" width="20" height="20" style="width: 20px; height: 20px;"></canvas>
<script>
function draw(canvas, color) {
var c = document.getElementById(canvas);
Expand All @@ -18,9 +34,24 @@
ctx.fillRect(0, 0, c.width, c.height);
}

draw('cvs0', '#66FF00');
draw('cvs1', '#000000');
draw('cvs2', '#66FF00');
draw('cvs3', '#00000000');
draw('cvs00', '#66FF00');
draw('cvs01', '#000000');
draw('cvs02', '#66FF00');
draw('cvs03', '#00000000');

draw('cvs10', '#000000');
draw('cvs11', '#000000');
draw('cvs12', '#00000000');
draw('cvs13', '#00000000');

draw('cvs20', '#00000000');
draw('cvs21', '#00000000');
draw('cvs22', '#00000000');
draw('cvs23', '#00000000');

draw('cvs30', '#000000');
draw('cvs31', '#000000');
draw('cvs32', '#00000000');
draw('cvs33', '#00000000');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

µNit: It's a little strange to have some of these colors be 6 hex digits and others be 8? I feel like the intent might be a bit clearer if we explicitly put the last FF/00 on them to indicate the expected alpha state?

</script>
</html>
Loading