Roll third_party/webgpu-cts/ 7ea4404fa..82a512494 (6 commits)
Regenerated:
- expectations.txt
- ts_sources.txt
- test_list.txt
- cache_list.txt
- resource_files.txt
- webtest .html files
https://chromium.googlesource.com/external/github.com/gpuweb/cts/+log/7ea4404fa9d9..82a512494491
- 82a512 Compat: skip sample_mask tests (#2792)
- 6a70df Compat skip texture view format (#2791)
- 95a1ab Compat: Pass in options to workers (#2787)
- 768732 Validation tests for pointer uniformity (#2774)
- 086261 Compat: Skip testing bgra8unorm-srgb in more places (#2786)
- c67bcb Expression uniformity validation tests (#2772)
Created with './tools/run cts roll'
Change-Id: I8000bb64c667d0c4ae27d5cab66a45b932c00e40
Cq-Include-Trybots: luci.chromium.try:android-dawn-arm-rel,android-dawn-arm64-rel,dawn-try-win10-x86-rel,linux-dawn-rel,mac-dawn-rel,win-dawn-rel
Include-Ci-Only-Tests: true
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/139422
Commit-Queue: Gregg Tavares <gman@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
diff --git a/webgpu-cts/expectations.txt b/webgpu-cts/expectations.txt
index 7afadb2..7609ee4 100644
--- a/webgpu-cts/expectations.txt
+++ b/webgpu-cts/expectations.txt
@@ -68,7 +68,7 @@
# results: [ Failure RetryOnFailure Skip Slow ]
# END TAG HEADER
-# Last rolled: 2023-06-23 11:41:57PM
+# Last rolled: 2023-06-28 09:02:36PM
################################################################################
# copyToTexture failures on Linux
@@ -1010,5 +1010,5 @@
crbug.com/dawn/0000 [ ventura ] webgpu:web_platform,copyToTexture,canvas:copy_contents_from_bitmaprenderer_context_canvas:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=false [ Failure ]
crbug.com/dawn/0000 [ ventura ] webgpu:web_platform,copyToTexture,canvas:copy_contents_from_bitmaprenderer_context_canvas:canvasType="offscreen";dstColorFormat="rgba8unorm-srgb";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true [ Failure ]
crbug.com/dawn/0000 [ intel-0x9bc5 ubuntu webgpu-adapter-default ] webgpu:web_platform,copyToTexture,video:* [ Failure ]
-crbug.com/dawn/0000 [ win nvidia ] webgpu:web_platform,canvas,configure:format:canvasType="onscreen";format="rg16sint" [ Failure ]
-crbug.com/dawn/0000 [ win ] webgpu:web_platform,copyToTexture,canvas:copy_contents_from_gpu_context_canvas:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true [ Failure ]
\ No newline at end of file
+crbug.com/dawn/0000 [ nvidia win ] webgpu:web_platform,canvas,configure:format:canvasType="onscreen";format="rg16sint" [ Failure ]
+crbug.com/dawn/0000 [ win ] webgpu:web_platform,copyToTexture,canvas:copy_contents_from_gpu_context_canvas:canvasType="offscreen";srcAndDstInSameGPUDevice=false;dstColorFormat="rgba8unorm";srcAlphaMode="premultiplied";dstAlphaMode="premultiplied";srcDoFlipYDuringCopy=true [ Failure ]
diff --git a/webgpu-cts/test_runner.js b/webgpu-cts/test_runner.js
index ec3bf76..0af764c 100644
--- a/webgpu-cts/test_runner.js
+++ b/webgpu-cts/test_runner.js
@@ -18,6 +18,8 @@
import { prettyPrintLog } from '../third_party/webgpu-cts/src/common/internal/logging/log_message.js';
import { Logger } from '../third_party/webgpu-cts/src/common/internal/logging/logger.js';
import { parseQuery } from '../third_party/webgpu-cts/src/common/internal/query/parseQuery.js';
+import { parseSearchParamLikeWithCTSOptions } from '../third_party/webgpu-cts/src/common/runtime/helper/options.js';
+import { setDefaultRequestAdapterOptions } from '../third_party/webgpu-cts/src/common/util/navigator_gpu.js';
import { TestWorker } from '../third_party/webgpu-cts/src/common/runtime/helper/test_worker.js';
@@ -151,14 +153,26 @@
globalTestConfig.unrollConstEvalLoops = true;
}
-async function runCtsTest(query, use_worker) {
- const workerEnabled = use_worker;
- const worker = workerEnabled ? new TestWorker(false) : undefined;
+// MAINTENANCE_TODO(gman): remove use_worker since you can use worker=1 instead
+async function runCtsTest(queryString, use_worker) {
+ const { queries, options } = parseSearchParamLikeWithCTSOptions(queryString);
+ const workerEnabled = use_worker || options.worker;
+ const worker = workerEnabled ? new TestWorker(options) : undefined;
const loader = new DefaultTestFileLoader();
- const filterQuery = parseQuery(query);
+ const filterQuery = parseQuery(queries[0]);
const testcases = await loader.loadCases(filterQuery);
+ const { compatibility, powerPreference } = options;
+ globalTestConfig.compatibility = compatibility;
+ if (powerPreference || compatibility) {
+ setDefaultRequestAdapterOptions({
+ ...(powerPreference && { powerPreference }),
+ // MAINTENANCE_TODO(gman): Change this to whatever the option ends up being
+ ...(compatibility && { compatibilityMode: true }),
+ });
+ }
+
const expectations = [];
const log = new Logger();