Skip to content

Commit f364887

Browse files
ErichDonGublerpchevrel@mozilla.com
ErichDonGubler
authored and
pchevrel@mozilla.com
committed
Bug 1972486 - chore(webgpu): release on stable on Windows with narrowed service worker pref. r=webgpu-reviewers,jimb a=pascalc
Aggregates D255381 and D253924 for uplift to Beta. Differential Revision: https://phabricator.services.mozilla.com/D255649
1 parent 67556c4 commit f364887

15 files changed

Lines changed: 129 additions & 32 deletions

File tree

‎dom/tests/mochitest/general/test_interfaces.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,84 +470,124 @@ let interfaceNamesInGlobalScope = [
470470
{ name: "FragmentDirective", insecureContext: true },
471471
// IMPORTANT: Do not change this list without review from a DOM peer!
472472
{ name: "GPU", earlyBetaOrEarlier: true },
473+
{ name: "GPU", windows: true },
473474
// IMPORTANT: Do not change this list without review from a DOM peer!
474475
{ name: "GPUAdapter", earlyBetaOrEarlier: true },
476+
{ name: "GPUAdapter", windows: true },
475477
// IMPORTANT: Do not change this list without review from a DOM peer!
476478
{ name: "GPUAdapterInfo", earlyBetaOrEarlier: true },
479+
{ name: "GPUAdapterInfo", windows: true },
477480
// IMPORTANT: Do not change this list without review from a DOM peer!
478481
{ name: "GPUBindGroup", earlyBetaOrEarlier: true },
482+
{ name: "GPUBindGroup", windows: true },
479483
// IMPORTANT: Do not change this list without review from a DOM peer!
480484
{ name: "GPUBindGroupLayout", earlyBetaOrEarlier: true },
485+
{ name: "GPUBindGroupLayout", windows: true },
481486
// IMPORTANT: Do not change this list without review from a DOM peer!
482487
{ name: "GPUBuffer", earlyBetaOrEarlier: true },
488+
{ name: "GPUBuffer", windows: true },
483489
// IMPORTANT: Do not change this list without review from a DOM peer!
484490
{ name: "GPUBufferUsage", earlyBetaOrEarlier: true },
491+
{ name: "GPUBufferUsage", windows: true },
485492
// IMPORTANT: Do not change this list without review from a DOM peer!
486493
{ name: "GPUCanvasContext", earlyBetaOrEarlier: true },
494+
{ name: "GPUCanvasContext", windows: true },
487495
// IMPORTANT: Do not change this list without review from a DOM peer!
488496
{ name: "GPUColorWrite", earlyBetaOrEarlier: true },
497+
{ name: "GPUColorWrite", windows: true },
489498
// IMPORTANT: Do not change this list without review from a DOM peer!
490499
{ name: "GPUCommandBuffer", earlyBetaOrEarlier: true },
500+
{ name: "GPUCommandBuffer", windows: true },
491501
// IMPORTANT: Do not change this list without review from a DOM peer!
492502
{ name: "GPUCommandEncoder", earlyBetaOrEarlier: true },
503+
{ name: "GPUCommandEncoder", windows: true },
493504
// IMPORTANT: Do not change this list without review from a DOM peer!
494505
{ name: "GPUCompilationInfo", earlyBetaOrEarlier: true },
506+
{ name: "GPUCompilationInfo", windows: true },
495507
// IMPORTANT: Do not change this list without review from a DOM peer!
496508
{ name: "GPUCompilationMessage", earlyBetaOrEarlier: true },
509+
{ name: "GPUCompilationMessage", windows: true },
497510
// IMPORTANT: Do not change this list without review from a DOM peer!
498511
{ name: "GPUComputePassEncoder", earlyBetaOrEarlier: true },
512+
{ name: "GPUComputePassEncoder", windows: true },
499513
// IMPORTANT: Do not change this list without review from a DOM peer!
500514
{ name: "GPUComputePipeline", earlyBetaOrEarlier: true },
515+
{ name: "GPUComputePipeline", windows: true },
501516
// IMPORTANT: Do not change this list without review from a DOM peer!
502517
{ name: "GPUDevice", earlyBetaOrEarlier: true },
518+
{ name: "GPUDevice", windows: true },
503519
// IMPORTANT: Do not change this list without review from a DOM peer!
504520
{ name: "GPUDeviceLostInfo", earlyBetaOrEarlier: true },
521+
{ name: "GPUDeviceLostInfo", windows: true },
505522
// IMPORTANT: Do not change this list without review from a DOM peer!
506523
{ name: "GPUError", earlyBetaOrEarlier: true },
524+
{ name: "GPUError", windows: true },
507525
// IMPORTANT: Do not change this list without review from a DOM peer!
508526
{ name: "GPUExternalTexture", earlyBetaOrEarlier: true },
527+
{ name: "GPUExternalTexture", windows: true },
509528
// IMPORTANT: Do not change this list without review from a DOM peer!
510529
{ name: "GPUInternalError", earlyBetaOrEarlier: true },
530+
{ name: "GPUInternalError", windows: true },
511531
// IMPORTANT: Do not change this list without review from a DOM peer!
512532
{ name: "GPUMapMode", earlyBetaOrEarlier: true },
533+
{ name: "GPUMapMode", windows: true },
513534
// IMPORTANT: Do not change this list without review from a DOM peer!
514535
{ name: "GPUOutOfMemoryError", earlyBetaOrEarlier: true },
536+
{ name: "GPUOutOfMemoryError", windows: true },
515537
// IMPORTANT: Do not change this list without review from a DOM peer!
516538
{ name: "GPUPipelineError", earlyBetaOrEarlier: true },
539+
{ name: "GPUPipelineError", windows: true },
517540
// IMPORTANT: Do not change this list without review from a DOM peer!
518541
{ name: "GPUPipelineLayout", earlyBetaOrEarlier: true },
542+
{ name: "GPUPipelineLayout", windows: true },
519543
// IMPORTANT: Do not change this list without review from a DOM peer!
520544
{ name: "GPUQuerySet", earlyBetaOrEarlier: true },
545+
{ name: "GPUQuerySet", windows: true },
521546
// IMPORTANT: Do not change this list without review from a DOM peer!
522547
{ name: "GPUQueue", earlyBetaOrEarlier: true },
548+
{ name: "GPUQueue", windows: true },
523549
// IMPORTANT: Do not change this list without review from a DOM peer!
524550
{ name: "GPURenderBundle", earlyBetaOrEarlier: true },
551+
{ name: "GPURenderBundle", windows: true },
525552
// IMPORTANT: Do not change this list without review from a DOM peer!
526553
{ name: "GPURenderBundleEncoder", earlyBetaOrEarlier: true },
554+
{ name: "GPURenderBundleEncoder", windows: true },
527555
// IMPORTANT: Do not change this list without review from a DOM peer!
528556
{ name: "GPURenderPassEncoder", earlyBetaOrEarlier: true },
557+
{ name: "GPURenderPassEncoder", windows: true },
529558
// IMPORTANT: Do not change this list without review from a DOM peer!
530559
{ name: "GPURenderPipeline", earlyBetaOrEarlier: true },
560+
{ name: "GPURenderPipeline", windows: true },
531561
// IMPORTANT: Do not change this list without review from a DOM peer!
532562
{ name: "GPUSampler", earlyBetaOrEarlier: true },
563+
{ name: "GPUSampler", windows: true },
533564
// IMPORTANT: Do not change this list without review from a DOM peer!
534565
{ name: "GPUShaderModule", earlyBetaOrEarlier: true },
566+
{ name: "GPUShaderModule", windows: true },
535567
// IMPORTANT: Do not change this list without review from a DOM peer!
536568
{ name: "GPUShaderStage", earlyBetaOrEarlier: true },
569+
{ name: "GPUShaderStage", windows: true },
537570
// IMPORTANT: Do not change this list without review from a DOM peer!
538571
{ name: "GPUSupportedFeatures", earlyBetaOrEarlier: true },
572+
{ name: "GPUSupportedFeatures", windows: true },
539573
// IMPORTANT: Do not change this list without review from a DOM peer!
540574
{ name: "GPUSupportedLimits", earlyBetaOrEarlier: true },
575+
{ name: "GPUSupportedLimits", windows: true },
541576
// IMPORTANT: Do not change this list without review from a DOM peer!
542577
{ name: "GPUTexture", earlyBetaOrEarlier: true },
578+
{ name: "GPUTexture", windows: true },
543579
// IMPORTANT: Do not change this list without review from a DOM peer!
544580
{ name: "GPUTextureUsage", earlyBetaOrEarlier: true },
581+
{ name: "GPUTextureUsage", windows: true },
545582
// IMPORTANT: Do not change this list without review from a DOM peer!
546583
{ name: "GPUTextureView", earlyBetaOrEarlier: true },
584+
{ name: "GPUTextureView", windows: true },
547585
// IMPORTANT: Do not change this list without review from a DOM peer!
548586
{ name: "GPUUncapturedErrorEvent", earlyBetaOrEarlier: true },
587+
{ name: "GPUUncapturedErrorEvent", windows: true },
549588
// IMPORTANT: Do not change this list without review from a DOM peer!
550589
{ name: "GPUValidationError", earlyBetaOrEarlier: true },
590+
{ name: "GPUValidationError", windows: true },
551591
// IMPORTANT: Do not change this list without review from a DOM peer!
552592
{ name: "GainNode", insecureContext: true },
553593
// IMPORTANT: Do not change this list without review from a DOM peer!
@@ -1474,6 +1514,7 @@ let interfaceNamesInGlobalScope = [
14741514
{ name: "VisualViewport", insecureContext: true },
14751515
// IMPORTANT: Do not change this list without review from a DOM peer!
14761516
{ name: "WGSLLanguageFeatures", earlyBetaOrEarlier: true },
1517+
{ name: "WGSLLanguageFeatures", windows: true },
14771518
// IMPORTANT: Do not change this list without review from a DOM peer!
14781519
{ name: "WakeLock" },
14791520
// IMPORTANT: Do not change this list without review from a DOM peer!

‎dom/webgpu/Instance.cpp‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
#include "nsString.h"
2323
#include "nsStringFwd.h"
2424

25-
#ifndef EARLY_BETA_OR_EARLIER
26-
# include "mozilla/dom/WorkerPrivate.h"
27-
#endif
25+
#include "mozilla/dom/WorkerPrivate.h"
2826

2927
#include <optional>
3028
#include <string_view>
@@ -48,7 +46,12 @@ static inline nsDependentCString ToCString(const std::string_view s) {
4846
return true;
4947
}
5048

51-
return StaticPrefs::dom_webgpu_workers_enabled();
49+
dom::WorkerPrivate* wp = dom::GetCurrentThreadWorkerPrivate();
50+
if (wp && wp->IsServiceWorker()) {
51+
return StaticPrefs::dom_webgpu_service_workers_enabled();
52+
}
53+
54+
return true;
5255
}
5356

5457
/*static*/
@@ -114,7 +117,11 @@ already_AddRefed<dom::Promise> Instance::RequestAdapter(
114117
};
115118

116119
#ifndef EARLY_BETA_OR_EARLIER
117-
rejectIf(true, "WebGPU is not yet available in Release or late Beta builds.");
120+
# ifndef XP_WIN
121+
rejectIf(true,
122+
"WebGPU is only available on Windows, and in Nightly and Early Beta "
123+
"builds on other platforms.");
124+
# endif
118125

119126
// NOTE: Deliberately left after the above check so that we only enter
120127
// here if it's removed. Above is a more informative diagnostic, while the

‎dom/webgpu/tests/mochitest/mochitest-disabled.toml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ subsuite = "webgpu"
33

44
# This file's tests should run when WebGPU is disabled by the logic in
55
# `gfxPlatform::InitWebGPUConfig`.
6-
#
7-
# This condition should be the exact complement of the `run-if` condition
8-
# in `mochitest.toml`.
9-
run-if = ["!(nightly_build || (os == 'win' && early_beta_or_earlier))"]
10-
11-
# `test-verify` jobs don't guarantee a GPU, so skip them.
12-
skip-if = ["verify"]
6+
skip-if = [
7+
# This condition should be the exact complement of the `run-if` condition
8+
# in `mochitest.toml`.
9+
"nightly_build",
10+
"os == 'win'",
11+
# `test-verify` jobs don't guarantee a GPU, so skip them.
12+
"verify"
13+
]
1314

1415
# Even if the pref were enabled, WebGPU is only available in secure contexts.
1516
#

‎dom/webgpu/tests/mochitest/mochitest-no-pref.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
subsuite = "webgpu"
33
# This file's tests should run when 'modules/libpref/init/StaticPrefList.yaml'
44
# defaults the 'dom.webgpu.enabled' pref to true.
5-
run-if = ["!early_beta_or_earlier"]
5+
run-if = ["!early_beta_or_earlier && os != 'win'"]
66
skip-if = ["verify"] # `test-verify` jobs don't guarantee a GPU, so skip them.
77

88
# Even if the pref were enabled, WebGPU is only available in secure contexts.

‎dom/webgpu/tests/mochitest/mochitest-resistfingerprinting.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run-if = ["!release_or_beta"]
44
skip-if = ["verify"] # `test-verify` jobs don't guarantee a GPU, so skip them.
55
prefs = [
66
"dom.webgpu.enabled=true",
7-
"dom.webgpu.workers.enabled=true",
7+
"dom.webgpu.service-workers.enabled=true",
88
"privacy.fingerprintingProtection=true",
99
"privacy.fingerprintingProtection.overrides='-AllTargets,+WebGPULimits'",
1010
]

‎dom/webgpu/tests/mochitest/mochitest.toml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ subsuite = "webgpu"
66
#
77
# This condition should be the exact complement of the `run-if`
88
# condition in `mochitest-disabled.html`.
9-
run-if = ["nightly_build || (os == 'win' && early_beta_or_earlier)"]
9+
run-if = [
10+
"nightly_build",
11+
"os == 'win'",
12+
]
1013

1114
# `test-verify` jobs don't guarantee a GPU, so skip them.
1215
skip-if = ["verify"]
1316

1417
prefs = [
1518
"dom.webgpu.enabled=true",
16-
"dom.webgpu.workers.enabled=true",
19+
"dom.webgpu.service-workers.enabled=true",
1720
]
1821
support-files = [
1922
"worker_wrapper.js",

‎dom/webgpu/tests/mochitest/perftest.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ run-if = ["!release_or_beta"]
44
skip-if = ["verify"] # `test-verify` jobs don't guarantee a GPU, so skip them.
55
prefs = [
66
"dom.webgpu.enabled=true",
7-
"dom.webgpu.workers.enabled=true",
7+
"dom.webgpu.service-workers.enabled=true",
88
]
99
support-files = [
1010
"worker_wrapper.js",

‎dom/workers/test/navigator_worker.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ var supportedProps = [
1212
{ name: "appVersion", insecureContext: true },
1313
{ name: "globalPrivacyControl", insecureContext: true },
1414
{ name: "gpu", earlyBetaOrEarlier: true },
15+
{ name: "gpu", windows: true },
1516
{ name: "platform", insecureContext: true },
1617
{ name: "product", insecureContext: true },
1718
{ name: "userAgent", insecureContext: true },

‎dom/workers/test/test_worker_interfaces.js‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,84 +237,124 @@ let interfaceNamesInGlobalScope = [
237237
{ name: "FormData", insecureContext: true },
238238
// IMPORTANT: Do not change this list without review from a DOM peer!
239239
{ name: "GPU", earlyBetaOrEarlier: true },
240+
{ name: "GPU", windows: true },
240241
// IMPORTANT: Do not change this list without review from a DOM peer!
241242
{ name: "GPUAdapter", earlyBetaOrEarlier: true },
243+
{ name: "GPUAdapter", windows: true },
242244
// IMPORTANT: Do not change this list without review from a DOM peer!
243245
{ name: "GPUAdapterInfo", earlyBetaOrEarlier: true },
246+
{ name: "GPUAdapterInfo", windows: true },
244247
// IMPORTANT: Do not change this list without review from a DOM peer!
245248
{ name: "GPUBindGroup", earlyBetaOrEarlier: true },
249+
{ name: "GPUBindGroup", windows: true },
246250
// IMPORTANT: Do not change this list without review from a DOM peer!
247251
{ name: "GPUBindGroupLayout", earlyBetaOrEarlier: true },
252+
{ name: "GPUBindGroupLayout", windows: true },
248253
// IMPORTANT: Do not change this list without review from a DOM peer!
249254
{ name: "GPUBuffer", earlyBetaOrEarlier: true },
255+
{ name: "GPUBuffer", windows: true },
250256
// IMPORTANT: Do not change this list without review from a DOM peer!
251257
{ name: "GPUBufferUsage", earlyBetaOrEarlier: true },
258+
{ name: "GPUBufferUsage", windows: true },
252259
// IMPORTANT: Do not change this list without review from a DOM peer!
253260
{ name: "GPUCanvasContext", earlyBetaOrEarlier: true },
261+
{ name: "GPUCanvasContext", windows: true },
254262
// IMPORTANT: Do not change this list without review from a DOM peer!
255263
{ name: "GPUColorWrite", earlyBetaOrEarlier: true },
264+
{ name: "GPUColorWrite", windows: true },
256265
// IMPORTANT: Do not change this list without review from a DOM peer!
257266
{ name: "GPUCommandBuffer", earlyBetaOrEarlier: true },
267+
{ name: "GPUCommandBuffer", windows: true },
258268
// IMPORTANT: Do not change this list without review from a DOM peer!
259269
{ name: "GPUCommandEncoder", earlyBetaOrEarlier: true },
270+
{ name: "GPUCommandEncoder", windows: true },
260271
// IMPORTANT: Do not change this list without review from a DOM peer!
261272
{ name: "GPUCompilationInfo", earlyBetaOrEarlier: true },
273+
{ name: "GPUCompilationInfo", windows: true },
262274
// IMPORTANT: Do not change this list without review from a DOM peer!
263275
{ name: "GPUCompilationMessage", earlyBetaOrEarlier: true },
276+
{ name: "GPUCompilationMessage", windows: true },
264277
// IMPORTANT: Do not change this list without review from a DOM peer!
265278
{ name: "GPUComputePassEncoder", earlyBetaOrEarlier: true },
279+
{ name: "GPUComputePassEncoder", windows: true },
266280
// IMPORTANT: Do not change this list without review from a DOM peer!
267281
{ name: "GPUComputePipeline", earlyBetaOrEarlier: true },
282+
{ name: "GPUComputePipeline", windows: true },
268283
// IMPORTANT: Do not change this list without review from a DOM peer!
269284
{ name: "GPUDevice", earlyBetaOrEarlier: true },
285+
{ name: "GPUDevice", windows: true },
270286
// IMPORTANT: Do not change this list without review from a DOM peer!
271287
{ name: "GPUDeviceLostInfo", earlyBetaOrEarlier: true },
288+
{ name: "GPUDeviceLostInfo", windows: true },
272289
// IMPORTANT: Do not change this list without review from a DOM peer!
273290
{ name: "GPUError", earlyBetaOrEarlier: true },
291+
{ name: "GPUError", windows: true },
274292
// IMPORTANT: Do not change this list without review from a DOM peer!
275293
{ name: "GPUExternalTexture", earlyBetaOrEarlier: true },
294+
{ name: "GPUExternalTexture", windows: true },
276295
// IMPORTANT: Do not change this list without review from a DOM peer!
277296
{ name: "GPUInternalError", earlyBetaOrEarlier: true },
297+
{ name: "GPUInternalError", windows: true },
278298
// IMPORTANT: Do not change this list without review from a DOM peer!
279299
{ name: "GPUMapMode", earlyBetaOrEarlier: true },
300+
{ name: "GPUMapMode", windows: true },
280301
// IMPORTANT: Do not change this list without review from a DOM peer!
281302
{ name: "GPUOutOfMemoryError", earlyBetaOrEarlier: true },
303+
{ name: "GPUOutOfMemoryError", windows: true },
282304
// IMPORTANT: Do not change this list without review from a DOM peer!
283305
{ name: "GPUPipelineError", earlyBetaOrEarlier: true },
306+
{ name: "GPUPipelineError", windows: true },
284307
// IMPORTANT: Do not change this list without review from a DOM peer!
285308
{ name: "GPUPipelineLayout", earlyBetaOrEarlier: true },
309+
{ name: "GPUPipelineLayout", windows: true },
286310
// IMPORTANT: Do not change this list without review from a DOM peer!
287311
{ name: "GPUQuerySet", earlyBetaOrEarlier: true },
312+
{ name: "GPUQuerySet", windows: true },
288313
// IMPORTANT: Do not change this list without review from a DOM peer!
289314
{ name: "GPUQueue", earlyBetaOrEarlier: true },
315+
{ name: "GPUQueue", windows: true },
290316
// IMPORTANT: Do not change this list without review from a DOM peer!
291317
{ name: "GPURenderBundle", earlyBetaOrEarlier: true },
318+
{ name: "GPURenderBundle", windows: true },
292319
// IMPORTANT: Do not change this list without review from a DOM peer!
293320
{ name: "GPURenderBundleEncoder", earlyBetaOrEarlier: true },
321+
{ name: "GPURenderBundleEncoder", windows: true },
294322
// IMPORTANT: Do not change this list without review from a DOM peer!
295323
{ name: "GPURenderPassEncoder", earlyBetaOrEarlier: true },
324+
{ name: "GPURenderPassEncoder", windows: true },
296325
// IMPORTANT: Do not change this list without review from a DOM peer!
297326
{ name: "GPURenderPipeline", earlyBetaOrEarlier: true },
327+
{ name: "GPURenderPipeline", windows: true },
298328
// IMPORTANT: Do not change this list without review from a DOM peer!
299329
{ name: "GPUSampler", earlyBetaOrEarlier: true },
330+
{ name: "GPUSampler", windows: true },
300331
// IMPORTANT: Do not change this list without review from a DOM peer!
301332
{ name: "GPUShaderModule", earlyBetaOrEarlier: true },
333+
{ name: "GPUShaderModule", windows: true },
302334
// IMPORTANT: Do not change this list without review from a DOM peer!
303335
{ name: "GPUShaderStage", earlyBetaOrEarlier: true },
336+
{ name: "GPUShaderStage", windows: true },
304337
// IMPORTANT: Do not change this list without review from a DOM peer!
305338
{ name: "GPUSupportedFeatures", earlyBetaOrEarlier: true },
339+
{ name: "GPUSupportedFeatures", windows: true },
306340
// IMPORTANT: Do not change this list without review from a DOM peer!
307341
{ name: "GPUSupportedLimits", earlyBetaOrEarlier: true },
342+
{ name: "GPUSupportedLimits", windows: true },
308343
// IMPORTANT: Do not change this list without review from a DOM peer!
309344
{ name: "GPUTexture", earlyBetaOrEarlier: true },
345+
{ name: "GPUTexture", windows: true },
310346
// IMPORTANT: Do not change this list without review from a DOM peer!
311347
{ name: "GPUTextureUsage", earlyBetaOrEarlier: true },
348+
{ name: "GPUTextureUsage", windows: true },
312349
// IMPORTANT: Do not change this list without review from a DOM peer!
313350
{ name: "GPUTextureView", earlyBetaOrEarlier: true },
351+
{ name: "GPUTextureView", windows: true },
314352
// IMPORTANT: Do not change this list without review from a DOM peer!
315353
{ name: "GPUUncapturedErrorEvent", earlyBetaOrEarlier: true },
354+
{ name: "GPUUncapturedErrorEvent", windows: true },
316355
// IMPORTANT: Do not change this list without review from a DOM peer!
317356
{ name: "GPUValidationError", earlyBetaOrEarlier: true },
357+
{ name: "GPUValidationError", windows: true },
318358
// IMPORTANT: Do not change this list without review from a DOM peer!
319359
{ name: "Headers", insecureContext: true },
320360
// IMPORTANT: Do not change this list without review from a DOM peer!
@@ -475,6 +515,7 @@ let interfaceNamesInGlobalScope = [
475515
{ name: "VideoFrame", insecureContext: true },
476516
// IMPORTANT: Do not change this list without review from a DOM peer!
477517
{ name: "WGSLLanguageFeatures", earlyBetaOrEarlier: true },
518+
{ name: "WGSLLanguageFeatures", windows: true },
478519
// IMPORTANT: Do not change this list without review from a DOM peer!
479520
{ name: "WebGL2RenderingContext", insecureContext: true },
480521
// IMPORTANT: Do not change this list without review from a DOM peer!

‎gfx/thebes/gfxPlatform.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3213,12 +3213,11 @@ void gfxPlatform::InitWebGPUConfig() {
32133213

32143214
// When this condition changes, be sure to update the `run-if`
32153215
// conditions in `dom/webgpu/tests/mochitest/*.toml` accordingly.
3216-
#if !(defined(NIGHTLY_BUILD) || \
3217-
(defined(XP_WIN) && defined(EARLY_BETA_OR_EARLIER)))
3216+
#if !(defined(NIGHTLY_BUILD) || defined(XP_WIN))
32183217
feature.ForceDisable(
32193218
FeatureStatus::Blocked,
3220-
"WebGPU cannot be enabled unless in Nightly, or Early Beta on Windows.",
3221-
"WEBGPU_DISABLE_RELEASE_OR_NON_WINDOWS_EARLY_BETA"_ns);
3219+
"WebGPU cannot be enabled unless in Nightly or on Windows.",
3220+
"WEBGPU_DISABLE_RELEASE_OR_NON_WINDOWS"_ns);
32223221
#endif
32233222

32243223
gfxVars::SetAllowWebGPU(feature.IsEnabled());

0 commit comments

Comments
 (0)