Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 6e6265b

Browse files
IulianMoraruIulianMoraru
committed
Backed out 4 changesets (bug 1917102) for causing crashes (bug 1917444). CLOSED TREE
Backed out changeset 1f02a210aaec (bug 1917102) Backed out changeset f77816ce785b (bug 1917102) Backed out changeset 2119546af722 (bug 1917102) Backed out changeset 0eb0e97434f1 (bug 1917102)
1 parent db0dc5b commit 6e6265b

File tree

172 files changed

+2700
-3378
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+2700
-3378
lines changed

‎.cargo/config.toml.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ git = "https://github.com/franziskuskiefer/cose-rust"
2525
rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
2626
replace-with = "vendored-sources"
2727

28-
[source."git+https://github.com/gfx-rs/wgpu?rev=ec2100052132a047fe0799c084696d6c0ee7629d"]
28+
[source."git+https://github.com/gfx-rs/wgpu?rev=bbdbafdf8a947b563b46f632a778632b906d9eb4"]
2929
git = "https://github.com/gfx-rs/wgpu"
30-
rev = "ec2100052132a047fe0799c084696d6c0ee7629d"
30+
rev = "bbdbafdf8a947b563b46f632a778632b906d9eb4"
3131
replace-with = "vendored-sources"
3232

3333
[source."git+https://github.com/hsivonen/any_all_workaround?rev=7fb1b7034c9f172aade21ee1c8554e8d8a48af80"]

‎Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gfx/wgpu_bindings/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ default = []
1717
[dependencies.wgc]
1818
package = "wgpu-core"
1919
git = "https://github.com/gfx-rs/wgpu"
20-
rev = "ec2100052132a047fe0799c084696d6c0ee7629d"
20+
rev = "bbdbafdf8a947b563b46f632a778632b906d9eb4"
2121
# TODO: remove the replay feature on the next update containing https://github.com/gfx-rs/wgpu/pull/5182
2222
features = ["serde", "replay", "trace", "strict_asserts", "wgsl", "api_log_info"]
2323

@@ -26,32 +26,32 @@ features = ["serde", "replay", "trace", "strict_asserts", "wgsl", "api_log_info"
2626
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
2727
package = "wgpu-core"
2828
git = "https://github.com/gfx-rs/wgpu"
29-
rev = "ec2100052132a047fe0799c084696d6c0ee7629d"
29+
rev = "bbdbafdf8a947b563b46f632a778632b906d9eb4"
3030
features = ["metal"]
3131

3232
# We want the wgpu-core Direct3D backends on Windows.
3333
[target.'cfg(windows)'.dependencies.wgc]
3434
package = "wgpu-core"
3535
git = "https://github.com/gfx-rs/wgpu"
36-
rev = "ec2100052132a047fe0799c084696d6c0ee7629d"
36+
rev = "bbdbafdf8a947b563b46f632a778632b906d9eb4"
3737
features = ["dx12"]
3838

3939
# We want the wgpu-core Vulkan backend on Linux and Windows.
4040
[target.'cfg(any(windows, all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies.wgc]
4141
package = "wgpu-core"
4242
git = "https://github.com/gfx-rs/wgpu"
43-
rev = "ec2100052132a047fe0799c084696d6c0ee7629d"
43+
rev = "bbdbafdf8a947b563b46f632a778632b906d9eb4"
4444
features = ["vulkan"]
4545

4646
[dependencies.wgt]
4747
package = "wgpu-types"
4848
git = "https://github.com/gfx-rs/wgpu"
49-
rev = "ec2100052132a047fe0799c084696d6c0ee7629d"
49+
rev = "bbdbafdf8a947b563b46f632a778632b906d9eb4"
5050

5151
[dependencies.wgh]
5252
package = "wgpu-hal"
5353
git = "https://github.com/gfx-rs/wgpu"
54-
rev = "ec2100052132a047fe0799c084696d6c0ee7629d"
54+
rev = "bbdbafdf8a947b563b46f632a778632b906d9eb4"
5555
features = ["oom_panic", "device_lost_panic", "internal_error_panic"]
5656

5757
[target.'cfg(windows)'.dependencies]

‎gfx/wgpu_bindings/moz.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ origin:
2020

2121
# Human-readable identifier for this version/release
2222
# Generally "version NNN", "tag SSS", "bookmark SSS"
23-
release: ec2100052132a047fe0799c084696d6c0ee7629d (Thu Sep 5 11:08:51 2024).
23+
release: bbdbafdf8a947b563b46f632a778632b906d9eb4 (2024-08-29T02:44:20Z).
2424

2525
# Revision to pull in
2626
# Must be a long or short commit SHA (long preferred)
27-
revision: ec2100052132a047fe0799c084696d6c0ee7629d
27+
revision: bbdbafdf8a947b563b46f632a778632b906d9eb4
2828

2929
license: ['MIT', 'Apache-2.0']
3030

‎supply-chain/audits.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3112,12 +3112,12 @@ delta = "0.20.0 -> 22.0.0"
31123112

31133113
[[audits.naga]]
31143114
who = [
3115+
"Jim Blandy <jimb@red-bean.com>",
31153116
"Teodor Tanasoaia <ttanasoaia@mozilla.com>",
31163117
"Erich Gubler <erichdongubler@gmail.com>",
3117-
"Jim Blandy <jimb@red-bean.com>",
31183118
]
31193119
criteria = "safe-to-deploy"
3120-
delta = "22.0.0 -> 22.0.0@git:ec2100052132a047fe0799c084696d6c0ee7629d"
3120+
delta = "22.0.0 -> 22.0.0@git:bbdbafdf8a947b563b46f632a778632b906d9eb4"
31213121
importable = false
31223122

31233123
[[audits.net2]]
@@ -5096,12 +5096,12 @@ delta = "0.20.0 -> 22.0.0"
50965096

50975097
[[audits.wgpu-core]]
50985098
who = [
5099+
"Jim Blandy <jimb@red-bean.com>",
50995100
"Teodor Tanasoaia <ttanasoaia@mozilla.com>",
51005101
"Erich Gubler <erichdongubler@gmail.com>",
5101-
"Jim Blandy <jimb@red-bean.com>",
51025102
]
51035103
criteria = "safe-to-deploy"
5104-
delta = "22.0.0 -> 22.0.0@git:ec2100052132a047fe0799c084696d6c0ee7629d"
5104+
delta = "22.0.0 -> 22.0.0@git:bbdbafdf8a947b563b46f632a778632b906d9eb4"
51055105
importable = false
51065106

51075107
[[audits.wgpu-hal]]
@@ -5169,12 +5169,12 @@ delta = "0.20.0 -> 22.0.0"
51695169

51705170
[[audits.wgpu-hal]]
51715171
who = [
5172+
"Jim Blandy <jimb@red-bean.com>",
51725173
"Teodor Tanasoaia <ttanasoaia@mozilla.com>",
51735174
"Erich Gubler <erichdongubler@gmail.com>",
5174-
"Jim Blandy <jimb@red-bean.com>",
51755175
]
51765176
criteria = "safe-to-deploy"
5177-
delta = "22.0.0 -> 22.0.0@git:ec2100052132a047fe0799c084696d6c0ee7629d"
5177+
delta = "22.0.0 -> 22.0.0@git:bbdbafdf8a947b563b46f632a778632b906d9eb4"
51785178
importable = false
51795179

51805180
[[audits.wgpu-types]]
@@ -5242,12 +5242,12 @@ delta = "0.20.0 -> 22.0.0"
52425242

52435243
[[audits.wgpu-types]]
52445244
who = [
5245+
"Jim Blandy <jimb@red-bean.com>",
52455246
"Teodor Tanasoaia <ttanasoaia@mozilla.com>",
52465247
"Erich Gubler <erichdongubler@gmail.com>",
5247-
"Jim Blandy <jimb@red-bean.com>",
52485248
]
52495249
criteria = "safe-to-deploy"
5250-
delta = "22.0.0 -> 22.0.0@git:ec2100052132a047fe0799c084696d6c0ee7629d"
5250+
delta = "22.0.0 -> 22.0.0@git:bbdbafdf8a947b563b46f632a778632b906d9eb4"
52515251
importable = false
52525252

52535253
[[audits.whatsys]]

‎supply-chain/imports.lock

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -510,13 +510,6 @@ user-id = 3618
510510
user-login = "dtolnay"
511511
user-name = "David Tolnay"
512512

513-
[[publisher.serde]]
514-
version = "1.0.209"
515-
when = "2024-08-24"
516-
user-id = 3618
517-
user-login = "dtolnay"
518-
user-name = "David Tolnay"
519-
520513
[[publisher.serde_bytes]]
521514
version = "0.11.9"
522515
when = "2023-02-05"
@@ -538,13 +531,6 @@ user-id = 3618
538531
user-login = "dtolnay"
539532
user-name = "David Tolnay"
540533

541-
[[publisher.serde_derive]]
542-
version = "1.0.209"
543-
when = "2024-08-24"
544-
user-id = 3618
545-
user-login = "dtolnay"
546-
user-name = "David Tolnay"
547-
548534
[[publisher.serde_json]]
549535
version = "1.0.116"
550536
when = "2024-04-16"

‎testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/operation/command_buffer/copyTextureToTexture/cts.https.html.ini

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,9 +1269,7 @@
12691269

12701270
[:srcFormat="rgba32float";dstFormat="rgba32float";dimension="1d"]
12711271
expected:
1272-
if os == "win" and debug: [TIMEOUT, NOTRUN]
1273-
if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
1274-
if os == "mac" and debug: [TIMEOUT, NOTRUN]
1272+
if debug: [TIMEOUT, NOTRUN]
12751273

12761274
[:srcFormat="rgba32float";dstFormat="rgba32float";dimension="2d"]
12771275
expected:
@@ -1296,15 +1294,15 @@
12961294
expected:
12971295
if os == "win" and debug: [TIMEOUT, NOTRUN]
12981296
if os == "win" and not debug: FAIL
1299-
if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
1297+
if os == "linux" and debug: [TIMEOUT, NOTRUN]
13001298
if os == "linux" and not debug: FAIL
13011299
if os == "mac" and debug: [TIMEOUT, NOTRUN]
13021300

13031301
[:srcFormat="rgba32sint";dstFormat="rgba32sint";dimension="3d"]
13041302
expected:
13051303
if os == "win" and debug: [TIMEOUT, NOTRUN]
13061304
if os == "win" and not debug: FAIL
1307-
if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
1305+
if os == "linux" and debug: [TIMEOUT, NOTRUN]
13081306
if os == "linux" and not debug: FAIL
13091307
if os == "mac" and debug: [TIMEOUT, NOTRUN]
13101308

‎testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/operation/memory_sync/buffer/multiple_buffers/cts.https.html.ini

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -504,16 +504,22 @@
504504
if os == "mac": [PASS, FAIL]
505505

506506
[:boundary="queue-op";readOp="input-index";readContext="render-bundle-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
507+
expected: FAIL
507508

508509
[:boundary="queue-op";readOp="input-index";readContext="render-bundle-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
510+
expected: FAIL
509511

510512
[:boundary="queue-op";readOp="input-index";readContext="render-bundle-encoder";writeOp="write-buffer";writeContext="queue"]
513+
expected: FAIL
511514

512515
[:boundary="queue-op";readOp="input-index";readContext="render-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
516+
expected: FAIL
513517

514518
[:boundary="queue-op";readOp="input-index";readContext="render-pass-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
519+
expected: FAIL
515520

516521
[:boundary="queue-op";readOp="input-index";readContext="render-pass-encoder";writeOp="write-buffer";writeContext="queue"]
522+
expected: FAIL
517523

518524
[:boundary="queue-op";readOp="input-indirect";readContext="render-bundle-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
519525
expected: FAIL
@@ -570,29 +576,33 @@
570576
expected: FAIL
571577

572578
[:boundary="queue-op";readOp="input-vertex";readContext="render-bundle-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
579+
expected: FAIL
573580

574581
[:boundary="queue-op";readOp="input-vertex";readContext="render-bundle-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
582+
expected: FAIL
575583

576584
[:boundary="queue-op";readOp="input-vertex";readContext="render-bundle-encoder";writeOp="write-buffer";writeContext="queue"]
585+
expected: FAIL
577586

578587
[:boundary="queue-op";readOp="input-vertex";readContext="render-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
579-
expected:
580-
if os == "win" and debug: [PASS, FAIL]
588+
expected: FAIL
581589

582590
[:boundary="queue-op";readOp="input-vertex";readContext="render-pass-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
591+
expected: FAIL
583592

584593
[:boundary="queue-op";readOp="input-vertex";readContext="render-pass-encoder";writeOp="write-buffer";writeContext="queue"]
594+
expected: FAIL
585595

586596
[:boundary="queue-op";readOp="storage-read";readContext="compute-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
587597
expected:
588598
if os == "win" and not debug: [PASS, FAIL]
589-
if os == "linux": [PASS, FAIL]
599+
if os == "linux" and debug: [PASS, FAIL]
590600
if os == "mac" and debug: [PASS, FAIL]
591601

592602
[:boundary="queue-op";readOp="storage-read";readContext="compute-pass-encoder";writeOp="storage";writeContext="compute-pass-encoder"]
593603
expected:
594604
if os == "linux" and debug: [PASS, FAIL]
595-
if os == "mac": [PASS, FAIL]
605+
if os == "mac" and not debug: [PASS, FAIL]
596606

597607
[:boundary="queue-op";readOp="storage-read";readContext="compute-pass-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
598608
expected:
@@ -622,7 +632,7 @@
622632

623633
[:boundary="queue-op";readOp="storage-read";readContext="render-pass-encoder";writeOp="write-buffer";writeContext="queue"]
624634
expected:
625-
if os == "linux": [PASS, FAIL]
635+
if os == "linux" and not debug: [PASS, FAIL]
626636
if os == "mac": [PASS, FAIL]
627637

628638

‎testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/operation/memory_sync/buffer/single_buffer/cts.https.html.ini

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,16 +488,22 @@
488488
[:boundary="queue-op";readOp="constant-uniform";readContext="render-pass-encoder";writeOp="write-buffer";writeContext="queue"]
489489

490490
[:boundary="queue-op";readOp="input-index";readContext="render-bundle-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
491+
expected: FAIL
491492

492493
[:boundary="queue-op";readOp="input-index";readContext="render-bundle-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
494+
expected: FAIL
493495

494496
[:boundary="queue-op";readOp="input-index";readContext="render-bundle-encoder";writeOp="write-buffer";writeContext="queue"]
497+
expected: FAIL
495498

496499
[:boundary="queue-op";readOp="input-index";readContext="render-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
500+
expected: FAIL
497501

498502
[:boundary="queue-op";readOp="input-index";readContext="render-pass-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
503+
expected: FAIL
499504

500505
[:boundary="queue-op";readOp="input-index";readContext="render-pass-encoder";writeOp="write-buffer";writeContext="queue"]
506+
expected: FAIL
501507

502508
[:boundary="queue-op";readOp="input-indirect";readContext="render-bundle-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
503509
expected: FAIL
@@ -554,18 +560,22 @@
554560
expected: FAIL
555561

556562
[:boundary="queue-op";readOp="input-vertex";readContext="render-bundle-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
563+
expected: FAIL
557564

558565
[:boundary="queue-op";readOp="input-vertex";readContext="render-bundle-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
559-
expected:
560-
if os == "linux" and debug: [PASS, FAIL]
566+
expected: FAIL
561567

562568
[:boundary="queue-op";readOp="input-vertex";readContext="render-bundle-encoder";writeOp="write-buffer";writeContext="queue"]
569+
expected: FAIL
563570

564571
[:boundary="queue-op";readOp="input-vertex";readContext="render-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
572+
expected: FAIL
565573

566574
[:boundary="queue-op";readOp="input-vertex";readContext="render-pass-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
575+
expected: FAIL
567576

568577
[:boundary="queue-op";readOp="input-vertex";readContext="render-pass-encoder";writeOp="write-buffer";writeContext="queue"]
578+
expected: FAIL
569579

570580
[:boundary="queue-op";readOp="storage-read";readContext="compute-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
571581
expected:
@@ -613,12 +623,10 @@
613623
[:boundary="queue-op";readOp="storage-read";readContext="render-pass-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
614624
expected:
615625
if os == "win": [PASS, FAIL]
616-
if os == "mac" and debug: [PASS, FAIL]
617626

618627
[:boundary="queue-op";readOp="storage-read";readContext="render-pass-encoder";writeOp="write-buffer";writeContext="queue"]
619628
expected:
620629
if os == "win": [PASS, FAIL]
621-
if os == "linux" and not debug: [PASS, FAIL]
622630
if os == "mac": [PASS, FAIL]
623631

624632

‎testing/web-platform/mozilla/meta/webgpu/cts/webgpu/api/operation/render_pipeline/primitive_topology/cts.https.html.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
expected: FAIL
77

88
[:topology="line-strip";indirect=false;primitiveRestart=false]
9-
expected:
10-
if os == "linux" and debug: [PASS, FAIL]
119

1210
[:topology="line-strip";indirect=false;primitiveRestart=true]
1311
expected:

0 commit comments

Comments
 (0)