From dc6af22f400c4171abe964813e5f8a7de78f7d93 Mon Sep 17 00:00:00 2001 From: Antonio Maiorano Date: Wed, 3 Nov 2021 13:55:43 +0000 Subject: [PATCH] dawn_node: add "--backend=" convenience parameter Same as passing in "--flag=dawn-backend=". Also, if VK_ICD_FILENAMES env var is set, force backend=vulkan. Bug: dawn:1163 Change-Id: If2def47e1af2a1eba7fbf897c8ed1ebf92ae4a15 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/68183 Reviewed-by: Antonio Maiorano Reviewed-by: Ben Clayton Commit-Queue: Antonio Maiorano --- src/dawn_node/tools/src/cmd/run-cts/main.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/dawn_node/tools/src/cmd/run-cts/main.go b/src/dawn_node/tools/src/cmd/run-cts/main.go index b4fd68b475..ef2754297b 100644 --- a/src/dawn_node/tools/src/cmd/run-cts/main.go +++ b/src/dawn_node/tools/src/cmd/run-cts/main.go @@ -86,7 +86,12 @@ func run() error { } } - var dawnNode, cts, node, npx, logFilename string + backendDefault := "default" + if vkIcdFilenames := os.Getenv("VK_ICD_FILENAMES"); vkIcdFilenames != "" { + backendDefault = "vulkan" + } + + var dawnNode, cts, node, npx, logFilename, backend string var verbose, isolated, build bool var numRunners int var flags dawnNodeFlags @@ -101,6 +106,8 @@ func run() error { flag.IntVar(&numRunners, "j", runtime.NumCPU()/2, "number of concurrent runners. 0 runs serially") flag.StringVar(&logFilename, "log", "", "path to log file of tests run and result") flag.Var(&flags, "flag", "flag to pass to dawn-node as flag=value. multiple flags must be passed in individually") + flag.StringVar(&backend, "backend", backendDefault, "backend to use: default|null|webgpu|d3d11|d3d12|metal|vulkan|opengl|opengles."+ + " set to 'vulkan' if VK_ICD_FILENAMES environment variable is set, 'default' otherwise") flag.Parse() if colors { @@ -156,6 +163,11 @@ func run() error { } } + if backend != "default" { + fmt.Println("Forcing backend to", backend) + flags = append(flags, fmt.Sprint("dawn-backend=", backend)) + } + r := runner{ numRunners: numRunners, verbose: verbose,