Skip to content

Commit

Permalink
Roll src/third_party/webgpu-cts/src/ 981b51315..68fbc0f8f (8 commits)
Browse files Browse the repository at this point in the history
https://chromium.googlesource.com/external/github.com/gpuweb/cts.git/+log/981b51315423..68fbc0f8f30c

$ git log 981b51315..68fbc0f8f --date=short --no-merges --format='%ad %ae %s'
2022-03-25 jrprice Fix numeric array sort in WGSL clamp tests (#1110)
2022-03-24 amaiorano Remove test leading to FXC compile failure (#1107)
2022-03-24 rharrison Update `clamp` tests to match spec (#1102)
2022-03-23 amaiorano Add evaluation order tests (#1083)
2022-03-23 hao.x.li Implement api,validation,state,device_mismatched: Part II (#1094)
2022-03-23 jiawei.shao Add validation,resource_usages,texture,in_render_common:* - Part III (#1098)
2022-03-23 jie.a.chen Add canvas STORAGE_BINDING cases for RGBA8Unorm and RGBA16Float (#1081)
2022-03-22 lokokung Adds destroy validation tests for some APIs. (#977)

Created with:
  roll-dep src/third_party/webgpu-cts/src

Change-Id: I261452cdbecf1ddda2ce1f36c054e6d43f3184cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3545959
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: James Price <jrprice@google.com>
Cr-Commit-Position: refs/heads/main@{#985406}
  • Loading branch information
jrprice authored and Chromium LUCI CQ committed Mar 25, 2022
1 parent 6d8c57e commit 941f569
Show file tree
Hide file tree
Showing 12 changed files with 200 additions and 4 deletions.
2 changes: 1 addition & 1 deletion DEPS
Expand Up @@ -1741,7 +1741,7 @@ deps = {
Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + 'cf04aebdf9b53bb2853f22a81465688daf879ec6',

'src/third_party/webgpu-cts/src':
Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '981b513154230fb38aaa1d999d4c30bd7a3c3966',
Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + '68fbc0f8f30c00408fb94807c197f055e5535795',

'src/third_party/webrtc':
Var('webrtc_git') + '/src.git' + '@' + '3cdd653d6691c145ac1e102224c7cd48a56c2ca5',
Expand Down
6 changes: 6 additions & 0 deletions third_party/blink/web_tests/WebGPUExpectations
Expand Up @@ -85,6 +85,12 @@ crbug.com/1309194 [ Linux ] wpt_internal/webgpu/cts.https.html?q=webgpu:web_plat
[ Mac ] wpt_internal/webgpu/cts.https.html?q=webgpu:api,validation,image_copy,layout_related:bound_on_bytes_per_row:* [ Timeout ]
[ Mac ] wpt_internal/webgpu/cts.https.html?q=webgpu:api,validation,image_copy,buffer_related:bytes_per_row_alignment:* [ Timeout ]

crbug.com/dawn/1330 wpt_internal/webgpu/cts.https.html?q=webgpu:api,validation,state,device_lost,destroy:createView,2d,uncompressed_format:* [ Failure Timeout ]
crbug.com/dawn/1330 wpt_internal/webgpu/cts.https.html?q=webgpu:api,validation,state,device_lost,destroy:createTexture,2d,uncompressed_format:* [ Failure Timeout ]

[ Win ] wpt_internal/webgpu/cts.https.html?q=webgpu:shader,execution,expression,call,builtin,clamp:f32:* [ Timeout ]


###
### Test bugs
###
Expand Down
40 changes: 39 additions & 1 deletion third_party/blink/web_tests/wpt_internal/webgpu/cts.https.html
Expand Up @@ -2060,6 +2060,7 @@
<meta name=variant content='?q=webgpu:api,validation,encoding,cmds,buffer_texture_copies:depth_stencil_format,copy_buffer_size:*'>
<meta name=variant content='?q=webgpu:api,validation,encoding,cmds,buffer_texture_copies:depth_stencil_format,copy_buffer_offset:*'>
<meta name=variant content='?q=webgpu:api,validation,encoding,cmds,clearBuffer:invalid_buffer:*'>
<meta name=variant content='?q=webgpu:api,validation,encoding,cmds,clearBuffer:buffer,device_mismatch:*'>
<meta name=variant content='?q=webgpu:api,validation,encoding,cmds,clearBuffer:default_args:*'>
<meta name=variant content='?q=webgpu:api,validation,encoding,cmds,clearBuffer:buffer_usage:*'>
<meta name=variant content='?q=webgpu:api,validation,encoding,cmds,clearBuffer:size_alignment:*'>
Expand Down Expand Up @@ -2225,6 +2226,7 @@
<meta name=variant content='?q=webgpu:api,validation,error_scope:push,popping_sibling_error_scopes_must_be_balanced:*'>
<meta name=variant content='?q=webgpu:api,validation,error_scope:push,popping_nested_error_scopes_must_be_balanced:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,buffer_related:valid:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,buffer_related:buffer,device_mismatch:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,buffer_related:usage:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,buffer_related:bytes_per_row_alignment:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,layout_related:bound_on_rows_per_image:*'>
Expand Down Expand Up @@ -2506,7 +2508,6 @@
<meta name=variant content='?q=webgpu:api,validation,image_copy,layout_related:bound_on_offset:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,texture_related:valid:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,texture_related:texture,device_mismatch:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,texture_related:buffer,device_mismatch:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,texture_related:usage:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,texture_related:sample_count:*'>
<meta name=variant content='?q=webgpu:api,validation,image_copy,texture_related:mip_level:*'>
Expand Down Expand Up @@ -2586,6 +2587,35 @@
<meta name=variant content='?q=webgpu:api,validation,resource_usages,texture,in_pass_encoder:validation_scope,different_passes:*'>
<meta name=variant content='?q=webgpu:api,validation,resource_usages,texture,in_render_common:subresources_from_same_texture_as_color_attachments:*'>
<meta name=variant content='?q=webgpu:api,validation,resource_usages,texture,in_render_common:subresources_from_same_texture_as_color_attachment_and_in_bind_group:*'>
<meta name=variant content='?q=webgpu:api,validation,resource_usages,texture,in_render_common:subresources_from_same_texture_as_depth_stencil_attachment_and_in_bind_group:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createBuffer:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createTexture,2d,uncompressed_format:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createTexture,2d,compressed_format:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createView,2d,uncompressed_format:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createView,2d,compressed_format:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createSampler:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createBindGroupLayout:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createBindGroup:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createPipelineLayout:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createShaderModule:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createComputePipeline:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createRenderPipeline:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createCommandEncoder:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createRenderBundleEncoder:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:createQuerySet:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,copyBufferToBuffer:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,copyBufferToTexture:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,copyTextureToBuffer:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,copyTextureToTexture:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,clearBuffer:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,writeTimestamp:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,resolveQuerySet:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,computePass,dispatch:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,renderPass,draw:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:command,renderPass,renderBundle:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:queue,writeBuffer:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:queue,writeTexture:*'>
<meta name=variant content='?q=webgpu:api,validation,state,device_lost,destroy:queue,copyExternalImageToTexture:*'>
<meta name=variant content='?q=webgpu:api,validation,texture,destroy:base:*'>
<meta name=variant content='?q=webgpu:api,validation,texture,destroy:twice:*'>
<meta name=variant content='?q=webgpu:api,validation,texture,destroy:submit_a_destroyed_texture_as_attachment:*'>
Expand Down Expand Up @@ -2712,6 +2742,14 @@
<meta name=variant content='?q=webgpu:idl,constants,flags:ColorWrite,values:*'>
<meta name=variant content='?q=webgpu:idl,constants,flags:ShaderStage,count:*'>
<meta name=variant content='?q=webgpu:idl,constants,flags:ShaderStage,values:*'>
<meta name=variant content='?q=webgpu:shader,execution,evaluation_order:binary_arith:*'>
<meta name=variant content='?q=webgpu:shader,execution,evaluation_order:binary_logical:*'>
<meta name=variant content='?q=webgpu:shader,execution,evaluation_order:binary_mixed:*'>
<meta name=variant content='?q=webgpu:shader,execution,evaluation_order:call:*'>
<meta name=variant content='?q=webgpu:shader,execution,evaluation_order:index_accessor:*'>
<meta name=variant content='?q=webgpu:shader,execution,evaluation_order:assignment:*'>
<meta name=variant content='?q=webgpu:shader,execution,evaluation_order:type_constructor:*'>
<meta name=variant content='?q=webgpu:shader,execution,evaluation_order:member_accessor:*'>
<meta name=variant content='?q=webgpu:shader,execution,expression,binary,bitwise:bitwise_or:*'>
<meta name=variant content='?q=webgpu:shader,execution,expression,binary,bitwise:bitwise_and:*'>
<meta name=variant content='?q=webgpu:shader,execution,expression,binary,bitwise:bitwise_exclusive_or:*'>
Expand Down
@@ -1,6 +1,6 @@
<html class="reftest-wait">
<base href="/gen/third_party/webgpu-cts/src/webgpu/web_platform/reftests/" />
<title>WebGPU canvas_complex_bgra8unorm_copy_buffer_to_texture</title>
<title>WebGPU canvas_complex_bgra8unorm_copy</title>
<meta charset="utf-8" />
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<meta
Expand Down
@@ -1,6 +1,6 @@
<html class="reftest-wait">
<base href="/gen/third_party/webgpu-cts/src/webgpu/web_platform/reftests/" />
<title>WebGPU canvas_complex_bgra8unorm_copy_buffer_to_texture</title>
<title>WebGPU canvas_complex_bgra8unorm_draw</title>
<meta charset="utf-8" />
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<meta
Expand Down
@@ -0,0 +1,25 @@
<html class="reftest-wait">
<base href="/gen/third_party/webgpu-cts/src/webgpu/web_platform/reftests/" />
<title>WebGPU canvas_complex_rgba16float_copy</title>
<meta charset="utf-8" />
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<meta
name="assert"
content="WebGPU canvas should have correct orientation, components, scaling, filtering, color space"
/>
<link rel="match" href="./ref/canvas_complex-ref.html" />

<canvas id="cvs_copy_buffer_to_texture" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_copy_texture_to_texture" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_copy_external_image_to_texture" width="2" height="2" style="width: 20px; height: 20px;"></canvas>

<script src="/common/reftest-wait.js"></script>
<script type="module">
import { run } from './canvas_complex.html.js';
run('rgba16float', [
{ cvs: cvs_copy_buffer_to_texture, writeCanvasMethod: 'copyBufferToTexture' },
{ cvs: cvs_copy_texture_to_texture, writeCanvasMethod: 'copyTextureToTexture' },
{ cvs: cvs_copy_external_image_to_texture, writeCanvasMethod: 'copyExternalImageToTexture' },
]);
</script>
</html>
@@ -0,0 +1,25 @@
<html class="reftest-wait">
<base href="/gen/third_party/webgpu-cts/src/webgpu/web_platform/reftests/" />
<title>WebGPU canvas_complex_rgba16float_draw</title>
<meta charset="utf-8" />
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<meta
name="assert"
content="WebGPU canvas should have correct orientation, components, scaling, filtering, color space"
/>
<link rel="match" href="./ref/canvas_complex-ref.html" />

<canvas id="cvs_draw_texture_sample" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_draw_vertex_color" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_draw_fragcoord" width="2" height="2" style="width: 20px; height: 20px;"></canvas>

<script src="/common/reftest-wait.js"></script>
<script type="module">
import { run } from './canvas_complex.html.js';
run('rgba16float', [
{ cvs: cvs_draw_texture_sample, writeCanvasMethod: 'DrawTextureSample' },
{ cvs: cvs_draw_vertex_color, writeCanvasMethod: 'DrawVertexColor' },
{ cvs: cvs_draw_fragcoord, writeCanvasMethod: 'DrawFragcoord' },
]);
</script>
</html>
@@ -0,0 +1,25 @@
<html class="reftest-wait">
<base href="/gen/third_party/webgpu-cts/src/webgpu/web_platform/reftests/" />
<title>WebGPU canvas_complex_rgba16float_store</title>
<meta charset="utf-8" />
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<meta
name="assert"
content="WebGPU canvas should have correct orientation, components, scaling, filtering, color space"
/>
<link rel="match" href="./ref/canvas_complex-ref.html" />

<canvas id="cvs_fragment_texture_store" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_compute_texture_store_1" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_compute_texture_store_2" width="2" height="2" style="width: 20px; height: 20px;"></canvas>

<script src="/common/reftest-wait.js"></script>
<script type="module">
import { run } from './canvas_complex.html.js';
run('rgba16float', [
{ cvs: cvs_fragment_texture_store, writeCanvasMethod: 'FragmentTextureStore' },
{ cvs: cvs_compute_texture_store_1, writeCanvasMethod: 'ComputeWorkgroup1x1TextureStore' },
{ cvs: cvs_compute_texture_store_2, writeCanvasMethod: 'ComputeWorkgroup2x2TextureStore' },
]);
</script>
</html>
@@ -0,0 +1,25 @@
<html class="reftest-wait">
<base href="/gen/third_party/webgpu-cts/src/webgpu/web_platform/reftests/" />
<title>WebGPU canvas_complex_rgba8unorm_copy</title>
<meta charset="utf-8" />
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<meta
name="assert"
content="WebGPU canvas should have correct orientation, components, scaling, filtering, color space"
/>
<link rel="match" href="./ref/canvas_complex-ref.html" />

<canvas id="cvs_copy_buffer_to_texture" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_copy_texture_to_texture" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_copy_external_image_to_texture" width="2" height="2" style="width: 20px; height: 20px;"></canvas>

<script src="/common/reftest-wait.js"></script>
<script type="module">
import { run } from './canvas_complex.html.js';
run('rgba8unorm', [
{ cvs: cvs_copy_buffer_to_texture, writeCanvasMethod: 'copyBufferToTexture' },
{ cvs: cvs_copy_texture_to_texture, writeCanvasMethod: 'copyTextureToTexture' },
{ cvs: cvs_copy_external_image_to_texture, writeCanvasMethod: 'copyExternalImageToTexture' },
]);
</script>
</html>
@@ -0,0 +1,25 @@
<html class="reftest-wait">
<base href="/gen/third_party/webgpu-cts/src/webgpu/web_platform/reftests/" />
<title>WebGPU canvas_complex_rgba8unorm_draw</title>
<meta charset="utf-8" />
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<meta
name="assert"
content="WebGPU canvas should have correct orientation, components, scaling, filtering, color space"
/>
<link rel="match" href="./ref/canvas_complex-ref.html" />

<canvas id="cvs_draw_texture_sample" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_draw_vertex_color" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_draw_fragcoord" width="2" height="2" style="width: 20px; height: 20px;"></canvas>

<script src="/common/reftest-wait.js"></script>
<script type="module">
import { run } from './canvas_complex.html.js';
run('rgba8unorm', [
{ cvs: cvs_draw_texture_sample, writeCanvasMethod: 'DrawTextureSample' },
{ cvs: cvs_draw_vertex_color, writeCanvasMethod: 'DrawVertexColor' },
{ cvs: cvs_draw_fragcoord, writeCanvasMethod: 'DrawFragcoord' },
]);
</script>
</html>
@@ -0,0 +1,25 @@
<html class="reftest-wait">
<base href="/gen/third_party/webgpu-cts/src/webgpu/web_platform/reftests/" />
<title>WebGPU canvas_complex_rgba8unorm_store</title>
<meta charset="utf-8" />
<link rel="help" href="https://gpuweb.github.io/gpuweb/" />
<meta
name="assert"
content="WebGPU canvas should have correct orientation, components, scaling, filtering, color space"
/>
<link rel="match" href="./ref/canvas_complex-ref.html" />

<canvas id="cvs_fragment_texture_store" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_compute_texture_store_1" width="2" height="2" style="width: 20px; height: 20px;"></canvas>
<canvas id="cvs_compute_texture_store_2" width="2" height="2" style="width: 20px; height: 20px;"></canvas>

<script src="/common/reftest-wait.js"></script>
<script type="module">
import { run } from './canvas_complex.html.js';
run('rgba8unorm', [
{ cvs: cvs_fragment_texture_store, writeCanvasMethod: 'FragmentTextureStore' },
{ cvs: cvs_compute_texture_store_1, writeCanvasMethod: 'ComputeWorkgroup1x1TextureStore' },
{ cvs: cvs_compute_texture_store_2, writeCanvasMethod: 'ComputeWorkgroup2x2TextureStore' },
]);
</script>
</html>
2 changes: 2 additions & 0 deletions third_party/webgpu-cts/ts_sources.txt
Expand Up @@ -245,12 +245,14 @@ src/webgpu/api/validation/render_pass/storeOp.spec.ts
src/webgpu/api/validation/resource_usages/texture/in_pass_encoder.spec.ts
src/webgpu/api/validation/resource_usages/texture/in_render_common.spec.ts
src/webgpu/api/validation/resource_usages/texture/in_render_misc.spec.ts
src/webgpu/api/validation/state/device_lost/destroy.spec.ts
src/webgpu/api/validation/texture/destroy.spec.ts
src/webgpu/idl/exposed.html.ts
src/webgpu/idl/idl_test.ts
src/webgpu/idl/constants/flags.spec.ts
src/webgpu/shader/types.ts
src/webgpu/shader/values.ts
src/webgpu/shader/execution/evaluation_order.spec.ts
src/webgpu/shader/execution/robust_access.spec.ts
src/webgpu/shader/execution/robust_access_vertex.spec.ts
src/webgpu/shader/execution/zero_init.spec.ts
Expand Down

0 comments on commit 941f569

Please sign in to comment.