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

Commit db0dc5b

Browse files
IulianMoraruIulianMoraru
committed
Backed out 4 changesets (bug 1917059, bug 1873039) for causing conflicts when trying to backout Bug 1917102.
Backed out changeset 6cf53afd3269 (bug 1917059) Backed out changeset 8c95893c5aaf (bug 1917059) Backed out changeset 845b7034b36b (bug 1873039) Backed out changeset 347d2ffd901d (bug 1873039)
1 parent cc25f22 commit db0dc5b

File tree

30 files changed

+2379
-3183
lines changed

30 files changed

+2379
-3183
lines changed

‎dom/webgpu/Utility.cpp

Lines changed: 0 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -228,176 +228,6 @@ ffi::WGPUTextureFormat ConvertTextureFormat(
228228
case dom::GPUTextureFormat::Depth32float_stencil8:
229229
result.tag = ffi::WGPUTextureFormat_Depth32FloatStencil8;
230230
break;
231-
case dom::GPUTextureFormat::Astc_4x4_unorm:
232-
result.tag = ffi::WGPUTextureFormat_Astc;
233-
result.astc.block = ffi::WGPUAstcBlock_B4x4;
234-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
235-
break;
236-
case dom::GPUTextureFormat::Astc_4x4_unorm_srgb:
237-
result.tag = ffi::WGPUTextureFormat_Astc;
238-
result.astc.block = ffi::WGPUAstcBlock_B4x4;
239-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
240-
break;
241-
case dom::GPUTextureFormat::Astc_5x4_unorm:
242-
result.tag = ffi::WGPUTextureFormat_Astc;
243-
result.astc.block = ffi::WGPUAstcBlock_B5x4;
244-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
245-
break;
246-
case dom::GPUTextureFormat::Astc_5x4_unorm_srgb:
247-
result.tag = ffi::WGPUTextureFormat_Astc;
248-
result.astc.block = ffi::WGPUAstcBlock_B5x4;
249-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
250-
break;
251-
case dom::GPUTextureFormat::Astc_5x5_unorm:
252-
result.tag = ffi::WGPUTextureFormat_Astc;
253-
result.astc.block = ffi::WGPUAstcBlock_B5x5;
254-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
255-
break;
256-
case dom::GPUTextureFormat::Astc_5x5_unorm_srgb:
257-
result.tag = ffi::WGPUTextureFormat_Astc;
258-
result.astc.block = ffi::WGPUAstcBlock_B5x5;
259-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
260-
break;
261-
case dom::GPUTextureFormat::Astc_6x5_unorm:
262-
result.tag = ffi::WGPUTextureFormat_Astc;
263-
result.astc.block = ffi::WGPUAstcBlock_B6x5;
264-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
265-
break;
266-
case dom::GPUTextureFormat::Astc_6x5_unorm_srgb:
267-
result.tag = ffi::WGPUTextureFormat_Astc;
268-
result.astc.block = ffi::WGPUAstcBlock_B6x5;
269-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
270-
break;
271-
case dom::GPUTextureFormat::Astc_6x6_unorm:
272-
result.tag = ffi::WGPUTextureFormat_Astc;
273-
result.astc.block = ffi::WGPUAstcBlock_B6x6;
274-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
275-
break;
276-
case dom::GPUTextureFormat::Astc_6x6_unorm_srgb:
277-
result.tag = ffi::WGPUTextureFormat_Astc;
278-
result.astc.block = ffi::WGPUAstcBlock_B6x6;
279-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
280-
break;
281-
case dom::GPUTextureFormat::Astc_8x5_unorm:
282-
result.tag = ffi::WGPUTextureFormat_Astc;
283-
result.astc.block = ffi::WGPUAstcBlock_B8x5;
284-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
285-
break;
286-
case dom::GPUTextureFormat::Astc_8x5_unorm_srgb:
287-
result.tag = ffi::WGPUTextureFormat_Astc;
288-
result.astc.block = ffi::WGPUAstcBlock_B8x5;
289-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
290-
break;
291-
case dom::GPUTextureFormat::Astc_8x6_unorm:
292-
result.tag = ffi::WGPUTextureFormat_Astc;
293-
result.astc.block = ffi::WGPUAstcBlock_B8x6;
294-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
295-
break;
296-
case dom::GPUTextureFormat::Astc_8x6_unorm_srgb:
297-
result.tag = ffi::WGPUTextureFormat_Astc;
298-
result.astc.block = ffi::WGPUAstcBlock_B8x6;
299-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
300-
break;
301-
case dom::GPUTextureFormat::Astc_8x8_unorm:
302-
result.tag = ffi::WGPUTextureFormat_Astc;
303-
result.astc.block = ffi::WGPUAstcBlock_B8x8;
304-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
305-
break;
306-
case dom::GPUTextureFormat::Astc_8x8_unorm_srgb:
307-
result.tag = ffi::WGPUTextureFormat_Astc;
308-
result.astc.block = ffi::WGPUAstcBlock_B8x8;
309-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
310-
break;
311-
case dom::GPUTextureFormat::Astc_10x5_unorm:
312-
result.tag = ffi::WGPUTextureFormat_Astc;
313-
result.astc.block = ffi::WGPUAstcBlock_B10x5;
314-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
315-
break;
316-
case dom::GPUTextureFormat::Astc_10x5_unorm_srgb:
317-
result.tag = ffi::WGPUTextureFormat_Astc;
318-
result.astc.block = ffi::WGPUAstcBlock_B10x5;
319-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
320-
break;
321-
case dom::GPUTextureFormat::Astc_10x6_unorm:
322-
result.tag = ffi::WGPUTextureFormat_Astc;
323-
result.astc.block = ffi::WGPUAstcBlock_B10x6;
324-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
325-
break;
326-
case dom::GPUTextureFormat::Astc_10x6_unorm_srgb:
327-
result.tag = ffi::WGPUTextureFormat_Astc;
328-
result.astc.block = ffi::WGPUAstcBlock_B10x6;
329-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
330-
break;
331-
case dom::GPUTextureFormat::Astc_10x8_unorm:
332-
result.tag = ffi::WGPUTextureFormat_Astc;
333-
result.astc.block = ffi::WGPUAstcBlock_B10x8;
334-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
335-
break;
336-
case dom::GPUTextureFormat::Astc_10x8_unorm_srgb:
337-
result.tag = ffi::WGPUTextureFormat_Astc;
338-
result.astc.block = ffi::WGPUAstcBlock_B10x8;
339-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
340-
break;
341-
case dom::GPUTextureFormat::Astc_10x10_unorm:
342-
result.tag = ffi::WGPUTextureFormat_Astc;
343-
result.astc.block = ffi::WGPUAstcBlock_B10x10;
344-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
345-
break;
346-
case dom::GPUTextureFormat::Astc_10x10_unorm_srgb:
347-
result.tag = ffi::WGPUTextureFormat_Astc;
348-
result.astc.block = ffi::WGPUAstcBlock_B10x10;
349-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
350-
break;
351-
case dom::GPUTextureFormat::Astc_12x10_unorm:
352-
result.tag = ffi::WGPUTextureFormat_Astc;
353-
result.astc.block = ffi::WGPUAstcBlock_B12x10;
354-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
355-
break;
356-
case dom::GPUTextureFormat::Astc_12x10_unorm_srgb:
357-
result.tag = ffi::WGPUTextureFormat_Astc;
358-
result.astc.block = ffi::WGPUAstcBlock_B12x10;
359-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
360-
break;
361-
case dom::GPUTextureFormat::Astc_12x12_unorm:
362-
result.tag = ffi::WGPUTextureFormat_Astc;
363-
result.astc.block = ffi::WGPUAstcBlock_B12x12;
364-
result.astc.channel = ffi::WGPUAstcChannel_Unorm;
365-
break;
366-
case dom::GPUTextureFormat::Astc_12x12_unorm_srgb:
367-
result.tag = ffi::WGPUTextureFormat_Astc;
368-
result.astc.block = ffi::WGPUAstcBlock_B12x12;
369-
result.astc.channel = ffi::WGPUAstcChannel_UnormSrgb;
370-
break;
371-
case dom::GPUTextureFormat::Etc2_rgb8unorm:
372-
result.tag = ffi::WGPUTextureFormat_Etc2Rgb8Unorm;
373-
break;
374-
case dom::GPUTextureFormat::Etc2_rgb8unorm_srgb:
375-
result.tag = ffi::WGPUTextureFormat_Etc2Rgb8UnormSrgb;
376-
break;
377-
case dom::GPUTextureFormat::Etc2_rgb8a1unorm:
378-
result.tag = ffi::WGPUTextureFormat_Etc2Rgb8A1Unorm;
379-
break;
380-
case dom::GPUTextureFormat::Etc2_rgb8a1unorm_srgb:
381-
result.tag = ffi::WGPUTextureFormat_Etc2Rgb8A1UnormSrgb;
382-
break;
383-
case dom::GPUTextureFormat::Etc2_rgba8unorm:
384-
result.tag = ffi::WGPUTextureFormat_Etc2Rgba8Unorm;
385-
break;
386-
case dom::GPUTextureFormat::Etc2_rgba8unorm_srgb:
387-
result.tag = ffi::WGPUTextureFormat_Etc2Rgb8UnormSrgb;
388-
break;
389-
case dom::GPUTextureFormat::Eac_r11unorm:
390-
result.tag = ffi::WGPUTextureFormat_EacR11Unorm;
391-
break;
392-
case dom::GPUTextureFormat::Eac_r11snorm:
393-
result.tag = ffi::WGPUTextureFormat_EacR11Snorm;
394-
break;
395-
case dom::GPUTextureFormat::Eac_rg11unorm:
396-
result.tag = ffi::WGPUTextureFormat_EacRg11Unorm;
397-
break;
398-
case dom::GPUTextureFormat::Eac_rg11snorm:
399-
result.tag = ffi::WGPUTextureFormat_EacRg11Snorm;
400-
break;
401231
}
402232

403233
// Clang will check for us that the switch above is exhaustive,

‎dom/webidl/WebGPU.webidl

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -382,50 +382,6 @@ enum GPUTextureFormat {
382382
"bc6h-rgb-float",
383383
"bc7-rgba-unorm",
384384
"bc7-rgba-unorm-srgb",
385-
386-
// ETC2 compressed formats usable if "texture-compression-etc2" is both
387-
// supported by the device/user agent and enabled in requestDevice.
388-
"etc2-rgb8unorm",
389-
"etc2-rgb8unorm-srgb",
390-
"etc2-rgb8a1unorm",
391-
"etc2-rgb8a1unorm-srgb",
392-
"etc2-rgba8unorm",
393-
"etc2-rgba8unorm-srgb",
394-
"eac-r11unorm",
395-
"eac-r11snorm",
396-
"eac-rg11unorm",
397-
"eac-rg11snorm",
398-
399-
// ASTC compressed formats usable if "texture-compression-astc" is both
400-
// supported by the device/user agent and enabled in requestDevice.
401-
"astc-4x4-unorm",
402-
"astc-4x4-unorm-srgb",
403-
"astc-5x4-unorm",
404-
"astc-5x4-unorm-srgb",
405-
"astc-5x5-unorm",
406-
"astc-5x5-unorm-srgb",
407-
"astc-6x5-unorm",
408-
"astc-6x5-unorm-srgb",
409-
"astc-6x6-unorm",
410-
"astc-6x6-unorm-srgb",
411-
"astc-8x5-unorm",
412-
"astc-8x5-unorm-srgb",
413-
"astc-8x6-unorm",
414-
"astc-8x6-unorm-srgb",
415-
"astc-8x8-unorm",
416-
"astc-8x8-unorm-srgb",
417-
"astc-10x5-unorm",
418-
"astc-10x5-unorm-srgb",
419-
"astc-10x6-unorm",
420-
"astc-10x6-unorm-srgb",
421-
"astc-10x8-unorm",
422-
"astc-10x8-unorm-srgb",
423-
"astc-10x10-unorm",
424-
"astc-10x10-unorm-srgb",
425-
"astc-12x10-unorm",
426-
"astc-12x10-unorm-srgb",
427-
"astc-12x12-unorm",
428-
"astc-12x12-unorm-srgb",
429385
};
430386

431387
[Func="mozilla::webgpu::Instance::PrefEnabled",

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

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -862,36 +862,28 @@
862862
if os == "linux": FAIL
863863

864864
[:srcFormat="r16float";dstFormat="r16float";dimension="1d"]
865-
expected:
866-
if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
867865

868866
[:srcFormat="r16float";dstFormat="r16float";dimension="2d"]
869867
expected:
870868
if os == "win": FAIL
871-
if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
872-
if os == "linux" and not debug: FAIL
869+
if os == "linux": FAIL
873870

874871
[:srcFormat="r16float";dstFormat="r16float";dimension="3d"]
875872
expected:
876873
if os == "win": FAIL
877-
if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
878-
if os == "linux" and not debug: FAIL
874+
if os == "linux": FAIL
879875

880876
[:srcFormat="r16sint";dstFormat="r16sint";dimension="1d"]
881-
expected:
882-
if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
883877

884878
[:srcFormat="r16sint";dstFormat="r16sint";dimension="2d"]
885879
expected:
886880
if os == "win": FAIL
887-
if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
888-
if os == "linux" and not debug: FAIL
881+
if os == "linux": FAIL
889882

890883
[:srcFormat="r16sint";dstFormat="r16sint";dimension="3d"]
891884
expected:
892885
if os == "win": FAIL
893-
if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
894-
if os == "linux" and not debug: FAIL
886+
if os == "linux": FAIL
895887

896888
[:srcFormat="r16uint";dstFormat="r16uint";dimension="1d"]
897889

@@ -903,8 +895,7 @@
903895
[:srcFormat="r16uint";dstFormat="r16uint";dimension="3d"]
904896
expected:
905897
if os == "win": FAIL
906-
if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
907-
if os == "linux" and not debug: FAIL
898+
if os == "linux": FAIL
908899

909900
[:srcFormat="r32float";dstFormat="r32float";dimension="1d"]
910901
expected:
@@ -1050,14 +1041,11 @@
10501041
if os == "linux" and not debug: FAIL
10511042

10521043
[:srcFormat="rg16uint";dstFormat="rg16uint";dimension="1d"]
1053-
expected:
1054-
if os == "linux" and debug: [PASS, TIMEOUT, NOTRUN]
10551044

10561045
[:srcFormat="rg16uint";dstFormat="rg16uint";dimension="2d"]
10571046
expected:
10581047
if os == "win": FAIL
1059-
if os == "linux" and debug: [FAIL, TIMEOUT, NOTRUN]
1060-
if os == "linux" and not debug: FAIL
1048+
if os == "linux": FAIL
10611049

10621050
[:srcFormat="rg16uint";dstFormat="rg16uint";dimension="3d"]
10631051
expected:

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -321,16 +321,12 @@
321321
[:boundary="command-buffer";readOp="b2b-copy";readContext="command-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
322322

323323
[:boundary="command-buffer";readOp="b2b-copy";readContext="command-encoder";writeOp="storage";writeContext="compute-pass-encoder"]
324-
expected:
325-
if os == "mac" and debug: [PASS, FAIL]
326324

327325
[:boundary="command-buffer";readOp="b2b-copy";readContext="command-encoder";writeOp="storage";writeContext="render-bundle-encoder"]
328326
expected:
329-
if os == "mac": [PASS, FAIL]
327+
if os == "mac" and not debug: [PASS, FAIL]
330328

331329
[:boundary="command-buffer";readOp="b2b-copy";readContext="command-encoder";writeOp="storage";writeContext="render-pass-encoder"]
332-
expected:
333-
if os == "mac" and not debug: [PASS, FAIL]
334330

335331
[:boundary="command-buffer";readOp="b2b-copy";readContext="command-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
336332

@@ -486,16 +482,14 @@
486482
[:boundary="queue-op";readOp="b2t-copy";readContext="command-encoder";writeOp="write-buffer";writeContext="queue"]
487483

488484
[:boundary="queue-op";readOp="constant-uniform";readContext="render-bundle-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
489-
expected:
490-
if os == "mac" and debug: [PASS, FAIL]
491485

492486
[:boundary="queue-op";readOp="constant-uniform";readContext="render-bundle-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
493487
expected:
494488
if os == "mac" and not debug: [PASS, FAIL]
495489

496490
[:boundary="queue-op";readOp="constant-uniform";readContext="render-bundle-encoder";writeOp="write-buffer";writeContext="queue"]
497491
expected:
498-
if os == "mac": [PASS, FAIL]
492+
if os == "mac" and not debug: [PASS, FAIL]
499493

500494
[:boundary="queue-op";readOp="constant-uniform";readContext="render-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
501495
expected:
@@ -593,7 +587,7 @@
593587
expected:
594588
if os == "win" and not debug: [PASS, FAIL]
595589
if os == "linux": [PASS, FAIL]
596-
if os == "mac": [PASS, FAIL]
590+
if os == "mac" and debug: [PASS, FAIL]
597591

598592
[:boundary="queue-op";readOp="storage-read";readContext="compute-pass-encoder";writeOp="storage";writeContext="compute-pass-encoder"]
599593
expected:
@@ -610,8 +604,6 @@
610604
expected: [PASS, FAIL]
611605

612606
[:boundary="queue-op";readOp="storage-read";readContext="render-bundle-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
613-
expected:
614-
if os == "linux" and not debug: [PASS, FAIL]
615607

616608
[:boundary="queue-op";readOp="storage-read";readContext="render-bundle-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
617609
expected:
@@ -622,7 +614,7 @@
622614
[:boundary="queue-op";readOp="storage-read";readContext="render-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
623615
expected:
624616
if os == "linux" and not debug: [PASS, FAIL]
625-
if os == "mac": [PASS, FAIL]
617+
if os == "mac" and not debug: [PASS, FAIL]
626618

627619
[:boundary="queue-op";readOp="storage-read";readContext="render-pass-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
628620
expected:

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@
601601

602602
[:boundary="queue-op";readOp="storage-read";readContext="render-bundle-encoder";writeOp="write-buffer";writeContext="queue"]
603603
expected:
604-
if os == "linux": [PASS, FAIL]
604+
if os == "linux" and not debug: [PASS, FAIL]
605605
if os == "mac" and debug: [PASS, FAIL]
606606

607607
[:boundary="queue-op";readOp="storage-read";readContext="render-pass-encoder";writeOp="b2b-copy";writeContext="command-encoder"]
@@ -613,11 +613,13 @@
613613
[:boundary="queue-op";readOp="storage-read";readContext="render-pass-encoder";writeOp="t2b-copy";writeContext="command-encoder"]
614614
expected:
615615
if os == "win": [PASS, FAIL]
616-
if os == "linux": [PASS, FAIL]
617616
if os == "mac" and debug: [PASS, FAIL]
618617

619618
[:boundary="queue-op";readOp="storage-read";readContext="render-pass-encoder";writeOp="write-buffer";writeContext="queue"]
620-
expected: [PASS, FAIL]
619+
expected:
620+
if os == "win": [PASS, FAIL]
621+
if os == "linux" and not debug: [PASS, FAIL]
622+
if os == "mac": [PASS, FAIL]
621623

622624

623625
[cts.https.html?q=webgpu:api,operation,memory_sync,buffer,single_buffer:ww:*]

0 commit comments

Comments
 (0)