-
Notifications
You must be signed in to change notification settings - Fork 4
/
0001-RT-WIP.patch
2121 lines (2065 loc) · 103 KB
/
0001-RT-WIP.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 622b83474902dbba3b36e460da0d600a511b8ad8 Mon Sep 17 00:00:00 2001
From: Felix Maier <xilefmai@gmail.com>
Date: Mon, 11 May 2020 12:33:24 +0200
Subject: [PATCH] RT WIP
Add missing RT extension, Roll dawn
Roll dawn, add acceleration destroy, add acceleration instances, updateInstance, build/update acceleration container passes
Roll Dawn
Add SBT, Add GPUResource alias, add copyRayTracingAccelerationContainer, fix some stuff
Add RT pipeline, RT pass encoder, fix some stuff
Fix transform3D Z property, use transformMatrixSize
Add transformMatrixSize default, fix defaults
RT spec update WIP
RT spec update WIP
Update DEPS
WGPUTransform3D->WGPUTransform3DDescriptor
Update DEPS
Roll dawn
RT spec changes
Roll dawn
Load DXC/DXIL
---
DEPS | 10 +-
devenv | 0
.../service/webgpu_decoder_impl.cc | 4 +-
.../bindings/generated_in_modules.gni | 14 ++
.../renderer/bindings/idl_in_modules.gni | 21 ++
.../bindings/modules/v8/generated.gni | 4 +-
.../bindings/scripts/bind_gen/path_manager.py | 3 +
.../renderer/bindings/scripts/utilities.py | 3 +
.../blink/renderer/modules/webgpu/BUILD.gn | 11 +
.../modules/webgpu/client_validation.cc | 7 +
.../modules/webgpu/client_validation.h | 4 +
.../modules/webgpu/dawn_conversions.cc | 45 ++++
.../renderer/modules/webgpu/gpu_adapter.cc | 4 +
.../renderer/modules/webgpu/gpu_adapter.idl | 1 +
.../renderer/modules/webgpu/gpu_bind_group.cc | 6 +
.../modules/webgpu/gpu_bind_group_entry.idl | 2 +-
.../webgpu/gpu_bind_group_layout_entry.idl | 1 +
.../modules/webgpu/gpu_buffer_usage.h | 1 +
.../modules/webgpu/gpu_buffer_usage.idl | 1 +
.../modules/webgpu/gpu_command_encoder.cc | 59 +++++
.../modules/webgpu/gpu_command_encoder.h | 15 ++
.../modules/webgpu/gpu_command_encoder.idl | 11 +
.../renderer/modules/webgpu/gpu_device.cc | 16 ++
.../renderer/modules/webgpu/gpu_device.h | 13 +
.../renderer/modules/webgpu/gpu_device.idl | 5 +
.../gpu_ray_tracing_acceleration_container.cc | 224 ++++++++++++++++++
.../gpu_ray_tracing_acceleration_container.h | 36 +++
...gpu_ray_tracing_acceleration_container.idl | 14 ++
...cing_acceleration_container_descriptor.idl | 17 ++
...ray_tracing_acceleration_container_usage.h | 30 +++
...y_tracing_acceleration_container_usage.idl | 16 ++
..._acceleration_geometry_aabb_descriptor.idl | 12 +
...acing_acceleration_geometry_descriptor.idl | 18 ++
...acceleration_geometry_index_descriptor.idl | 12 +
..._ray_tracing_acceleration_geometry_usage.h | 28 +++
...ay_tracing_acceleration_geometry_usage.idl | 14 ++
...cceleration_geometry_vertex_descriptor.idl | 13 +
...acing_acceleration_instance_descriptor.idl | 16 ++
...leration_instance_transform_descriptor.idl | 11 +
..._ray_tracing_acceleration_instance_usage.h | 30 +++
...ay_tracing_acceleration_instance_usage.idl | 16 ++
.../gpu_ray_tracing_pass_descriptor.idl | 8 +
.../webgpu/gpu_ray_tracing_pass_encoder.cc | 93 ++++++++
.../webgpu/gpu_ray_tracing_pass_encoder.h | 57 +++++
.../webgpu/gpu_ray_tracing_pass_encoder.idl | 20 ++
.../webgpu/gpu_ray_tracing_pipeline.cc | 67 ++++++
.../modules/webgpu/gpu_ray_tracing_pipeline.h | 34 +++
.../webgpu/gpu_ray_tracing_pipeline.idl | 11 +
.../gpu_ray_tracing_pipeline_descriptor.idl | 9 +
.../gpu_ray_tracing_shader_binding_table.cc | 79 ++++++
.../gpu_ray_tracing_shader_binding_table.h | 34 +++
.../gpu_ray_tracing_shader_binding_table.idl | 11 +
...racing_shader_binding_table_descriptor.idl | 10 +
..._shader_binding_table_group_descriptor.idl | 19 ++
..._shader_binding_table_stage_descriptor.idl | 10 +
.../gpu_ray_tracing_state_descriptor.idl | 11 +
.../modules/webgpu/gpu_shader_stage.h | 5 +
.../modules/webgpu/gpu_shader_stage.idl | 5 +
.../webgpu/gpu_transform_3d_descriptor.idl | 11 +
.../blink/renderer/modules/webgpu/idls.gni | 21 ++
ui/gl/init/gl_initializer_win.cc | 10 +-
61 files changed, 1283 insertions(+), 10 deletions(-)
create mode 100644 devenv
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.cc
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.h
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container_usage.h
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container_usage.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_aabb_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_index_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_usage.h
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_usage.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_vertex_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_instance_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_instance_transform_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_instance_usage.h
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_instance_usage.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pass_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pass_encoder.cc
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pass_encoder.h
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pass_encoder.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pipeline.cc
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pipeline.h
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pipeline.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pipeline_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table.cc
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table.h
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table_group_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table_stage_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_state_descriptor.idl
create mode 100644 third_party/blink/renderer/modules/webgpu/gpu_transform_3d_descriptor.idl
diff --git a/DEPS b/DEPS
index 02de83bf7517..398de8ef0dbf 100644
--- a/DEPS
+++ b/DEPS
@@ -170,6 +170,7 @@ vars = {
'boringssl_git': 'https://boringssl.googlesource.com',
'chromium_git': 'https://chromium.googlesource.com',
'dawn_git': 'https://dawn.googlesource.com',
+ 'github_git': 'https://github.com',
'pdfium_git': 'https://pdfium.googlesource.com',
'quiche_git': 'https://quiche.googlesource.com',
'skia_git': 'https://skia.googlesource.com',
@@ -293,7 +294,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
- 'spirv_cross_revision': '7e0295abf81cc939ecb2644c88592d77407d18d3',
+ 'spirv_cross_revision': '1d629fcb2e56dd286d0291351ebc7c72d4d86ee0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
@@ -301,7 +302,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
- 'dawn_revision': '562255a94346d1121c433abfa2abe39aee135804',
+ 'dawn_revision': '4d00c624611c96695a4831c96b93316625e87682',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
@@ -356,6 +357,7 @@ allowed_hosts = [
'chrome-internal.googlesource.com',
'chromium.googlesource.com',
'dawn.googlesource.com',
+ 'github.com',
'pdfium.googlesource.com',
'quiche.googlesource.com',
'skia.googlesource.com',
@@ -613,7 +615,7 @@ deps = {
# the repository and dependencies include them like so:
# #include "spirv-cross/spirv_glsl.hpp"
'src/third_party/spirv-cross/spirv-cross':
- Var('chromium_git') + '/external/github.com/KhronosGroup/SPIRV-Cross.git@' +
+ Var('github_git') + '/maierfelix/SPIRV-Cross.git@' +
Var('spirv_cross_revision'),
'src/third_party/spirv-headers/src':
@@ -766,7 +768,7 @@ deps = {
Var('chromium_git') + '/external/github.com/videolan/dav1d.git' + '@' + '114e8f0ee53ba34d22452dc4bdc0e9ec263189c8',
'src/third_party/dawn':
- Var('dawn_git') + '/dawn.git' + '@' + Var('dawn_revision'),
+ Var('github_git') + '/maierfelix/dawn-ray-tracing.git' + '@' + Var('dawn_revision'),
'src/third_party/glfw/src':
Var('chromium_git') + '/external/github.com/glfw/glfw.git@' + '2de2589f910b1a85905f425be4d32f33cec092df',
diff --git a/devenv b/devenv
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/gpu/command_buffer/service/webgpu_decoder_impl.cc b/gpu/command_buffer/service/webgpu_decoder_impl.cc
index a4c8530dfd81..a8f90e6ad3d3 100644
--- a/gpu/command_buffer/service/webgpu_decoder_impl.cc
+++ b/gpu/command_buffer/service/webgpu_decoder_impl.cc
@@ -651,6 +651,9 @@ error::Error WebGPUDecoderImpl::InitDawnDeviceAndSetWireServer(
if (request_device_properties.textureCompressionBC) {
device_descriptor.requiredExtensions.push_back("texture_compression_bc");
}
+ if (request_device_properties.rayTracing) {
+ device_descriptor.requiredExtensions.push_back("ray_tracing");
+ }
WGPUDevice wgpu_device =
dawn_adapters_[requested_adapter_index].CreateDevice(&device_descriptor);
@@ -662,7 +665,6 @@ error::Error WebGPUDecoderImpl::InitDawnDeviceAndSetWireServer(
std::make_unique<DawnDeviceAndWireServer>(client(), wgpu_device,
device_client_id,
memory_transfer_service_.get());
-
return error::kNoError;
}
diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni
index 99a6057cb6ee..b06b02aa104d 100644
--- a/third_party/blink/renderer/bindings/generated_in_modules.gni
+++ b/third_party/blink/renderer/bindings/generated_in_modules.gni
@@ -672,6 +672,20 @@ generated_interface_sources_in_modules = [
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_pipeline_layout.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_queue.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_queue.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_container.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_container.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_container_usage.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_container_usage.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_geometry_usage.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_geometry_usage.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_instance_usage.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_instance_usage.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_pass_encoder.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_pass_encoder.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_pipeline.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_pipeline.h",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_shader_binding_table.cc",
+ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_shader_binding_table.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_render_bundle.cc",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_render_bundle.h",
"$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_gpu_render_bundle_encoder.cc",
diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni
index e0618d49fd06..1acb5a7f52d3 100644
--- a/third_party/blink/renderer/bindings/idl_in_modules.gni
+++ b/third_party/blink/renderer/bindings/idl_in_modules.gni
@@ -854,6 +854,26 @@ static_idl_files_in_modules = get_path_info(
"//third_party/blink/renderer/modules/webgpu/gpu_programmable_stage_descriptor.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_queue.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_rasterization_state_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container_usage.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_aabb_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_usage.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_index_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_geometry_vertex_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_instance_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_instance_usage.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_instance_transform_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pass_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pass_encoder.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pipeline.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pipeline_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table_group_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table_stage_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_state_descriptor.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_render_bundle.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_render_bundle_descriptor.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_render_bundle_encoder.idl",
@@ -880,6 +900,7 @@ static_idl_files_in_modules = get_path_info(
"//third_party/blink/renderer/modules/webgpu/gpu_texture_usage.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_texture_view.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_texture_view_descriptor.idl",
+ "//third_party/blink/renderer/modules/webgpu/gpu_transform_3d_descriptor.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_uncaptured_error_event.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_uncaptured_error_event_init.idl",
"//third_party/blink/renderer/modules/webgpu/gpu_validation_error.idl",
diff --git a/third_party/blink/renderer/bindings/modules/v8/generated.gni b/third_party/blink/renderer/bindings/modules/v8/generated.gni
index d715d4d0684b..94434450d119 100644
--- a/third_party/blink/renderer/bindings/modules/v8/generated.gni
+++ b/third_party/blink/renderer/bindings/modules/v8/generated.gni
@@ -49,6 +49,8 @@ bindings_modules_generated_union_type_files = [
"$bindings_modules_v8_output_dir/double_sequence_or_gpu_color_dict.h",
"$bindings_modules_v8_output_dir/float32_array_or_float64_array_or_dom_matrix.cc",
"$bindings_modules_v8_output_dir/float32_array_or_float64_array_or_dom_matrix.h",
+ "$bindings_modules_v8_output_dir/gpu_binding_resource.cc",
+ "$bindings_modules_v8_output_dir/gpu_binding_resource.h",
"$bindings_modules_v8_output_dir/gpu_buffer_or_array_buffer.cc",
"$bindings_modules_v8_output_dir/gpu_buffer_or_array_buffer.h",
"$bindings_modules_v8_output_dir/gpu_load_op_or_double_sequence_or_gpu_color_dict.cc",
@@ -59,8 +61,6 @@ bindings_modules_generated_union_type_files = [
"$bindings_modules_v8_output_dir/gpu_load_op_or_unsigned_long_enforce_range.h",
"$bindings_modules_v8_output_dir/gpu_out_of_memory_error_or_gpu_validation_error.cc",
"$bindings_modules_v8_output_dir/gpu_out_of_memory_error_or_gpu_validation_error.h",
- "$bindings_modules_v8_output_dir/gpu_sampler_or_gpu_texture_view_or_gpu_buffer_binding.cc",
- "$bindings_modules_v8_output_dir/gpu_sampler_or_gpu_texture_view_or_gpu_buffer_binding.h",
"$bindings_modules_v8_output_dir/html_canvas_element_or_offscreen_canvas.cc",
"$bindings_modules_v8_output_dir/html_canvas_element_or_offscreen_canvas.h",
"$bindings_modules_v8_output_dir/idb_object_store_or_idb_index.cc",
diff --git a/third_party/blink/renderer/bindings/scripts/bind_gen/path_manager.py b/third_party/blink/renderer/bindings/scripts/bind_gen/path_manager.py
index 47d6c08b8ee0..0aeb25a585dc 100644
--- a/third_party/blink/renderer/bindings/scripts/bind_gen/path_manager.py
+++ b/third_party/blink/renderer/bindings/scripts/bind_gen/path_manager.py
@@ -218,4 +218,7 @@ _BACKWARD_COMPATIBLE_UNION_FILEPATHS = {
# modules/canvas/offscreencanvas/offscreen_canvas_module.idl
"OffscreenCanvasRenderingContext2DOrWebGLRenderingContextOrWebGL2RenderingContextOrImageBitmapRenderingContext":
"OffscreenRenderingContext",
+ # modules/webgpu/gpu_bind_group_entry.idl
+ 'GPUSamplerOrGPUTextureViewOrGPUBufferBindingOrGPURayTracingAccelerationContainer':
+ 'GPUBindingResource',
}
diff --git a/third_party/blink/renderer/bindings/scripts/utilities.py b/third_party/blink/renderer/bindings/scripts/utilities.py
index 1dc06544585c..b13d15841845 100644
--- a/third_party/blink/renderer/bindings/scripts/utilities.py
+++ b/third_party/blink/renderer/bindings/scripts/utilities.py
@@ -499,6 +499,9 @@ def shorten_union_name(union_type):
# modules/canvas/offscreencanvas/offscreen_canvas_module.idl
'OffscreenCanvasRenderingContext2DOrWebGLRenderingContextOrWebGL2RenderingContextOrImageBitmapRenderingContext':
'OffscreenRenderingContext',
+ # modules/webgpu/gpu_bind_group_entry.idl
+ 'GPUSamplerOrGPUTextureViewOrGPUBufferBindingOrGPURayTracingAccelerationContainer':
+ 'GPUBindingResource'
}
idl_type = union_type
diff --git a/third_party/blink/renderer/modules/webgpu/BUILD.gn b/third_party/blink/renderer/modules/webgpu/BUILD.gn
index 01c03224f93f..cd6a52e9a3fe 100644
--- a/third_party/blink/renderer/modules/webgpu/BUILD.gn
+++ b/third_party/blink/renderer/modules/webgpu/BUILD.gn
@@ -49,6 +49,17 @@ blink_modules_sources("webgpu") {
"gpu_programmable_pass_encoder.h",
"gpu_queue.cc",
"gpu_queue.h",
+ "gpu_ray_tracing_acceleration_container.cc",
+ "gpu_ray_tracing_acceleration_container.h",
+ "gpu_ray_tracing_acceleration_container_usage.h",
+ "gpu_ray_tracing_acceleration_geometry_usage.h",
+ "gpu_ray_tracing_acceleration_instance_usage.h",
+ "gpu_ray_tracing_pass_encoder.cc",
+ "gpu_ray_tracing_pass_encoder.h",
+ "gpu_ray_tracing_pipeline.cc",
+ "gpu_ray_tracing_pipeline.h",
+ "gpu_ray_tracing_shader_binding_table.cc",
+ "gpu_ray_tracing_shader_binding_table.h",
"gpu_render_bundle.cc",
"gpu_render_bundle.h",
"gpu_render_bundle_encoder.cc",
diff --git a/third_party/blink/renderer/modules/webgpu/client_validation.cc b/third_party/blink/renderer/modules/webgpu/client_validation.cc
index 6a8ffb2fe1a4..312cc9c8e231 100644
--- a/third_party/blink/renderer/modules/webgpu/client_validation.cc
+++ b/third_party/blink/renderer/modules/webgpu/client_validation.cc
@@ -10,6 +10,7 @@
#include "third_party/blink/renderer/bindings/modules/v8/unsigned_long_enforce_range_sequence_or_gpu_origin_2d_dict.h"
#include "third_party/blink/renderer/bindings/modules/v8/unsigned_long_enforce_range_sequence_or_gpu_origin_3d_dict.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_texture_copy_view.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_container.h"
#include "third_party/blink/renderer/platform/bindings/exception_state.h"
namespace blink {
@@ -40,4 +41,10 @@ bool ValidateTextureCopyView(GPUTextureCopyView* texture_copy_view,
return true;
}
+bool ValidateRayTracingAccelerationContainer(GPURayTracingAccelerationContainer* container,
+ ExceptionState& exception_state) {
+ DCHECK(container);
+ return true;
+}
+
} // namespace blink
diff --git a/third_party/blink/renderer/modules/webgpu/client_validation.h b/third_party/blink/renderer/modules/webgpu/client_validation.h
index 47179e4b2a18..f16d63cd2fc2 100644
--- a/third_party/blink/renderer/modules/webgpu/client_validation.h
+++ b/third_party/blink/renderer/modules/webgpu/client_validation.h
@@ -13,6 +13,7 @@ namespace blink {
class ExceptionState;
class GPUTextureCopyView;
+class GPURayTracingAccelerationContainer;
class UnsignedLongEnforceRangeSequenceOrGPUExtent3DDict;
bool ValidateCopySize(
@@ -20,6 +21,9 @@ bool ValidateCopySize(
ExceptionState& exception_state);
bool ValidateTextureCopyView(GPUTextureCopyView* texture_copy_view,
ExceptionState& exception_state);
+bool ValidateRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer* container,
+ ExceptionState& exception_state);
} // namespace blink
#endif // THIRD_PARTY_BLINK_RENDERER_MODULES_WEBGPU_CLIENT_VALIDATION_H_
diff --git a/third_party/blink/renderer/modules/webgpu/dawn_conversions.cc b/third_party/blink/renderer/modules/webgpu/dawn_conversions.cc
index a668a87edc7d..3f8314bd5737 100644
--- a/third_party/blink/renderer/modules/webgpu/dawn_conversions.cc
+++ b/third_party/blink/renderer/modules/webgpu/dawn_conversions.cc
@@ -43,6 +43,9 @@ WGPUBindingType AsDawnEnum<WGPUBindingType>(const WTF::String& webgpu_enum) {
if (webgpu_enum == "writeonly-storage-texture") {
return WGPUBindingType_WriteonlyStorageTexture;
}
+ if (webgpu_enum == "acceleration-container") {
+ return WGPUBindingType_AccelerationContainer;
+ }
NOTREACHED();
return WGPUBindingType_Force32;
}
@@ -370,6 +373,9 @@ WGPUIndexFormat AsDawnEnum<WGPUIndexFormat>(const WTF::String& webgpu_enum) {
if (webgpu_enum == "uint32") {
return WGPUIndexFormat_Uint32;
}
+ if (webgpu_enum == "none") {
+ return WGPUIndexFormat_None;
+ }
NOTREACHED();
return WGPUIndexFormat_Force32;
}
@@ -657,6 +663,45 @@ WGPUErrorFilter AsDawnEnum<WGPUErrorFilter>(const WTF::String& webgpu_enum) {
return WGPUErrorFilter_Force32;
}
+template <>
+WGPURayTracingAccelerationContainerLevel AsDawnEnum<WGPURayTracingAccelerationContainerLevel>(const WTF::String& webgpu_enum) {
+ if (webgpu_enum == "bottom") {
+ return WGPURayTracingAccelerationContainerLevel_Bottom;
+ }
+ if (webgpu_enum == "top") {
+ return WGPURayTracingAccelerationContainerLevel_Top;
+ }
+ NOTREACHED();
+ return WGPURayTracingAccelerationContainerLevel_Force32;
+}
+
+template <>
+WGPURayTracingAccelerationGeometryType AsDawnEnum<WGPURayTracingAccelerationGeometryType>(const WTF::String& webgpu_enum) {
+ if (webgpu_enum == "triangles") {
+ return WGPURayTracingAccelerationGeometryType_Triangles;
+ }
+ if (webgpu_enum == "aabbs") {
+ return WGPURayTracingAccelerationGeometryType_Aabbs;
+ }
+ NOTREACHED();
+ return WGPURayTracingAccelerationGeometryType_Force32;
+}
+
+template <>
+WGPURayTracingShaderBindingTableGroupType AsDawnEnum<WGPURayTracingShaderBindingTableGroupType>(const WTF::String& webgpu_enum) {
+ if (webgpu_enum == "general") {
+ return WGPURayTracingShaderBindingTableGroupType_General;
+ }
+ if (webgpu_enum == "triangles-hit-group") {
+ return WGPURayTracingShaderBindingTableGroupType_TrianglesHitGroup;
+ }
+ if (webgpu_enum == "procedural-hit-group") {
+ return WGPURayTracingShaderBindingTableGroupType_ProceduralHitGroup;
+ }
+ NOTREACHED();
+ return WGPURayTracingShaderBindingTableGroupType_Force32;
+}
+
WGPUColor AsDawnColor(const Vector<double>& webgpu_color) {
DCHECK_EQ(webgpu_color.size(), 4UL);
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_adapter.cc b/third_party/blink/renderer/modules/webgpu/gpu_adapter.cc
index 16697b5c677e..d904c71d376a 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_adapter.cc
+++ b/third_party/blink/renderer/modules/webgpu/gpu_adapter.cc
@@ -27,6 +27,7 @@ WGPUDeviceProperties AsDawnType(const GPUDeviceDescriptor* descriptor) {
// subset of the adapter's extension set.
requested_device_properties.textureCompressionBC =
extension_set.Contains("textureCompressionBC");
+ requested_device_properties.rayTracing = extension_set.Contains("rayTracing");
return requested_device_properties;
}
@@ -74,6 +75,9 @@ void GPUAdapter::InitializeExtensionNameList() {
if (adapter_properties_.textureCompressionBC) {
extension_name_list_.emplace_back("textureCompressionBC");
}
+ if (adapter_properties_.rayTracing) {
+ extension_name_list_.emplace_back("rayTracing");
+ }
}
ScriptPromise GPUAdapter::requestDevice(ScriptState* script_state,
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_adapter.idl b/third_party/blink/renderer/modules/webgpu/gpu_adapter.idl
index 735742c66bba..22e7f92e6887 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_adapter.idl
+++ b/third_party/blink/renderer/modules/webgpu/gpu_adapter.idl
@@ -6,6 +6,7 @@
enum GPUExtensionName {
"textureCompressionBC",
+ "rayTracing",
};
[
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_bind_group.cc b/third_party/blink/renderer/modules/webgpu/gpu_bind_group.cc
index 4933688c357b..c1765b3b7629 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_bind_group.cc
+++ b/third_party/blink/renderer/modules/webgpu/gpu_bind_group.cc
@@ -10,6 +10,7 @@
#include "third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_buffer.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_device.h"
+#include "third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_sampler.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_texture_view.h"
#include "third_party/blink/renderer/platform/bindings/exception_state.h"
@@ -37,6 +38,11 @@ WGPUBindGroupEntry AsDawnType(const GPUBindGroupEntry* webgpu_binding) {
webgpu_binding->resource().GetAsGPUTextureView();
dawn_binding.textureView = AsDawnType(texture_view);
+ } else if (webgpu_binding->resource().IsGPURayTracingAccelerationContainer()) {
+ GPURayTracingAccelerationContainer* acceleration_container =
+ webgpu_binding->resource().GetAsGPURayTracingAccelerationContainer();
+ dawn_binding.accelerationContainer = AsDawnType(acceleration_container);
+
} else {
NOTREACHED();
}
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_entry.idl b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_entry.idl
index c71a9ff2aece..820f0e995913 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_entry.idl
+++ b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_entry.idl
@@ -4,7 +4,7 @@
// https://gpuweb.github.io/gpuweb/
-typedef (GPUSampler or GPUTextureView or GPUBufferBinding) GPUBindingResource;
+typedef (GPUSampler or GPUTextureView or GPUBufferBinding or GPURayTracingAccelerationContainer) GPUBindingResource;
dictionary GPUBindGroupEntry {
required GPUIndex32 binding;
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout_entry.idl b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout_entry.idl
index a4084166bb0c..c544faba9bde 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout_entry.idl
+++ b/third_party/blink/renderer/modules/webgpu/gpu_bind_group_layout_entry.idl
@@ -26,6 +26,7 @@ enum GPUBindingType {
"sampled-texture",
"readonly-storage-texture",
"writeonly-storage-texture",
+ "acceleration-container"
};
enum GPUTextureComponentType {
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_buffer_usage.h b/third_party/blink/renderer/modules/webgpu/gpu_buffer_usage.h
index 5c922e7e4133..e40aef98a10f 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_buffer_usage.h
+++ b/third_party/blink/renderer/modules/webgpu/gpu_buffer_usage.h
@@ -23,6 +23,7 @@ class GPUBufferUsage : public ScriptWrappable {
static constexpr uint32_t kUniform = 64;
static constexpr uint32_t kStorage = 128;
static constexpr uint32_t kIndirect = 256;
+ static constexpr uint32_t kRayTracing = 512;
private:
DISALLOW_COPY_AND_ASSIGN(GPUBufferUsage);
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_buffer_usage.idl b/third_party/blink/renderer/modules/webgpu/gpu_buffer_usage.idl
index 061bfa159510..9c50ca249d9a 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_buffer_usage.idl
+++ b/third_party/blink/renderer/modules/webgpu/gpu_buffer_usage.idl
@@ -17,4 +17,5 @@ typedef [EnforceRange] unsigned long GPUBufferUsageFlags;
const unsigned long UNIFORM = 64;
const unsigned long STORAGE = 128;
const unsigned long INDIRECT = 256;
+ const unsigned long RAY_TRACING = 512;
};
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.cc b/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.cc
index 6969bc8f4ec9..a938bbd8ccee 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.cc
+++ b/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.cc
@@ -11,6 +11,7 @@
#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_command_buffer_descriptor.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_command_encoder_descriptor.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_compute_pass_descriptor.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_pass_descriptor.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_render_pass_color_attachment_descriptor.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_render_pass_depth_stencil_attachment_descriptor.h"
#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_render_pass_descriptor.h"
@@ -21,6 +22,8 @@
#include "third_party/blink/renderer/modules/webgpu/gpu_command_buffer.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_compute_pass_encoder.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_device.h"
+#include "third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.h"
+#include "third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pass_encoder.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_render_pass_encoder.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_texture.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_texture_view.h"
@@ -255,6 +258,18 @@ GPUComputePassEncoder* GPUCommandEncoder::beginComputePass(
GetProcs().commandEncoderBeginComputePass(GetHandle(), &dawn_desc));
}
+GPURayTracingPassEncoder* GPUCommandEncoder::beginRayTracingPass(
+ const GPURayTracingPassDescriptor* descriptor) {
+ WGPURayTracingPassDescriptor dawn_desc = {};
+ if (descriptor->hasLabel()) {
+ dawn_desc.label = descriptor->label().Utf8().data();
+ }
+
+ return MakeGarbageCollected<GPURayTracingPassEncoder>(
+ device_,
+ GetProcs().commandEncoderBeginRayTracingPass(GetHandle(), &dawn_desc));
+}
+
void GPUCommandEncoder::copyBufferToBuffer(GPUBuffer* src,
uint64_t src_offset,
GPUBuffer* dst,
@@ -330,6 +345,50 @@ void GPUCommandEncoder::copyTextureToTexture(
GetHandle(), &dawn_source, &dawn_destination, &dawn_copy_size);
}
+void GPUCommandEncoder::buildRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer* container,
+ ExceptionState& exception_state) {
+ if (!ValidateRayTracingAccelerationContainer(container, exception_state)) {
+ return;
+ }
+
+ WGPURayTracingAccelerationContainer dawn_container = AsDawnType(container);
+
+ GetProcs().commandEncoderBuildRayTracingAccelerationContainer(
+ GetHandle(), dawn_container);
+}
+
+void GPUCommandEncoder::updateRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer* container,
+ ExceptionState& exception_state) {
+ if (!ValidateRayTracingAccelerationContainer(container, exception_state)) {
+ return;
+ }
+
+ WGPURayTracingAccelerationContainer dawn_container = AsDawnType(container);
+
+ GetProcs().commandEncoderUpdateRayTracingAccelerationContainer(
+ GetHandle(), dawn_container);
+}
+
+void GPUCommandEncoder::copyRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer* src_container,
+ GPURayTracingAccelerationContainer* dst_container,
+ ExceptionState& exception_state) {
+ if (!ValidateRayTracingAccelerationContainer(src_container, exception_state)) {
+ return;
+ }
+ if (!ValidateRayTracingAccelerationContainer(dst_container, exception_state)) {
+ return;
+ }
+
+ WGPURayTracingAccelerationContainer dawn_src_container = AsDawnType(src_container);
+ WGPURayTracingAccelerationContainer dawn_dst_container = AsDawnType(dst_container);
+
+ GetProcs().commandEncoderCopyRayTracingAccelerationContainer(
+ GetHandle(), dawn_src_container, dawn_dst_container);
+}
+
void GPUCommandEncoder::pushDebugGroup(String groupLabel) {
GetProcs().commandEncoderPushDebugGroup(GetHandle(),
groupLabel.Utf8().data());
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.h b/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.h
index 04b36eba8501..164e05260150 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.h
+++ b/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.h
@@ -18,6 +18,9 @@ class GPUCommandBufferDescriptor;
class GPUCommandEncoderDescriptor;
class GPUComputePassDescriptor;
class GPUComputePassEncoder;
+class GPURayTracingAccelerationContainer;
+class GPURayTracingPassDescriptor;
+class GPURayTracingPassEncoder;
class GPURenderPassDescriptor;
class GPURenderPassEncoder;
class GPUTextureCopyView;
@@ -40,6 +43,8 @@ class GPUCommandEncoder : public DawnObject<WGPUCommandEncoder> {
ExceptionState& exception_state);
GPUComputePassEncoder* beginComputePass(
const GPUComputePassDescriptor* descriptor);
+ GPURayTracingPassEncoder* beginRayTracingPass(
+ const GPURayTracingPassDescriptor* descriptor);
void copyBufferToBuffer(GPUBuffer* src,
uint64_t src_offset,
GPUBuffer* dst,
@@ -60,6 +65,16 @@ class GPUCommandEncoder : public DawnObject<WGPUCommandEncoder> {
GPUTextureCopyView* destination,
UnsignedLongEnforceRangeSequenceOrGPUExtent3DDict& copy_size,
ExceptionState& exception_state);
+ void buildRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer* container,
+ ExceptionState& exception_state);
+ void updateRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer* container,
+ ExceptionState& exception_state);
+ void copyRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer* src_container,
+ GPURayTracingAccelerationContainer* dst_container,
+ ExceptionState& exception_state);
void pushDebugGroup(String groupLabel);
void popDebugGroup();
void insertDebugMarker(String markerLabel);
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.idl b/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.idl
index 3e9897a5e81a..b0ff59a04897 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.idl
+++ b/third_party/blink/renderer/modules/webgpu/gpu_command_encoder.idl
@@ -9,6 +9,7 @@
] interface GPUCommandEncoder {
[RaisesException] GPURenderPassEncoder beginRenderPass(GPURenderPassDescriptor descriptor);
GPUComputePassEncoder beginComputePass(optional GPUComputePassDescriptor descriptor = {});
+ GPURayTracingPassEncoder beginRayTracingPass(optional GPURayTracingPassDescriptor descriptor = {});
void copyBufferToBuffer(
GPUBuffer src,
@@ -32,6 +33,16 @@
GPUTextureCopyView destination,
GPUExtent3D copySize);
+ [RaisesException] void buildRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer container);
+
+ [RaisesException] void updateRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer container);
+
+ [RaisesException] void copyRayTracingAccelerationContainer(
+ GPURayTracingAccelerationContainer src_container,
+ GPURayTracingAccelerationContainer dst_container);
+
void pushDebugGroup(DOMString groupLabel);
void popDebugGroup();
void insertDebugMarker(DOMString markerLabel);
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_device.cc b/third_party/blink/renderer/modules/webgpu/gpu_device.cc
index f8f37f782489..c71dd8458c44 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_device.cc
+++ b/third_party/blink/renderer/modules/webgpu/gpu_device.cc
@@ -22,6 +22,9 @@
#include "third_party/blink/renderer/modules/webgpu/gpu_device_lost_info.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_pipeline_layout.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_queue.h"
+#include "third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.h"
+#include "third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_shader_binding_table.h"
+#include "third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_pipeline.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_render_bundle_encoder.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_render_pipeline.h"
#include "third_party/blink/renderer/modules/webgpu/gpu_sampler.h"
@@ -155,6 +158,14 @@ GPUSampler* GPUDevice::createSampler(const GPUSamplerDescriptor* descriptor) {
return GPUSampler::Create(this, descriptor);
}
+GPURayTracingAccelerationContainer* GPUDevice::createRayTracingAccelerationContainer(const GPURayTracingAccelerationContainerDescriptor* descriptor) {
+ return GPURayTracingAccelerationContainer::Create(this, descriptor);
+}
+
+GPURayTracingShaderBindingTable* GPUDevice::createRayTracingShaderBindingTable(const GPURayTracingShaderBindingTableDescriptor* descriptor) {
+ return GPURayTracingShaderBindingTable::Create(this, descriptor);
+}
+
GPUBindGroup* GPUDevice::createBindGroup(
const GPUBindGroupDescriptor* descriptor,
ExceptionState& exception_state) {
@@ -189,6 +200,11 @@ GPUComputePipeline* GPUDevice::createComputePipeline(
return GPUComputePipeline::Create(this, descriptor);
}
+GPURayTracingPipeline* GPUDevice::createRayTracingPipeline(
+ const GPURayTracingPipelineDescriptor* descriptor) {
+ return GPURayTracingPipeline::Create(this, descriptor);
+}
+
GPUCommandEncoder* GPUDevice::createCommandEncoder(
const GPUCommandEncoderDescriptor* descriptor) {
return GPUCommandEncoder::Create(this, descriptor);
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_device.h b/third_party/blink/renderer/modules/webgpu/gpu_device.h
index e27314bfa106..ce4fbd132c79 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_device.h
+++ b/third_party/blink/renderer/modules/webgpu/gpu_device.h
@@ -34,6 +34,12 @@ class GPUDeviceLostInfo;
class GPUPipelineLayout;
class GPUPipelineLayoutDescriptor;
class GPUQueue;
+class GPURayTracingAccelerationContainer;
+class GPURayTracingAccelerationContainerDescriptor;
+class GPURayTracingShaderBindingTable;
+class GPURayTracingShaderBindingTableDescriptor;
+class GPURayTracingPipeline;
+class GPURayTracingPipelineDescriptor;
class GPURenderBundleEncoder;
class GPURenderBundleEncoderDescriptor;
class GPURenderPipeline;
@@ -79,6 +85,11 @@ class GPUDevice final : public EventTargetWithInlineData,
ExceptionState& exception_state);
GPUSampler* createSampler(const GPUSamplerDescriptor* descriptor);
+ GPURayTracingAccelerationContainer* createRayTracingAccelerationContainer(
+ const GPURayTracingAccelerationContainerDescriptor* descriptor);
+ GPURayTracingShaderBindingTable* createRayTracingShaderBindingTable(
+ const GPURayTracingShaderBindingTableDescriptor* descriptor);
+
GPUBindGroup* createBindGroup(const GPUBindGroupDescriptor* descriptor,
ExceptionState& exception_state);
GPUBindGroupLayout* createBindGroupLayout(
@@ -95,6 +106,8 @@ class GPUDevice final : public EventTargetWithInlineData,
const GPURenderPipelineDescriptor* descriptor);
GPUComputePipeline* createComputePipeline(
const GPUComputePipelineDescriptor* descriptor);
+ GPURayTracingPipeline* createRayTracingPipeline(
+ const GPURayTracingPipelineDescriptor* descriptor);
GPUCommandEncoder* createCommandEncoder(
const GPUCommandEncoderDescriptor* descriptor);
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_device.idl b/third_party/blink/renderer/modules/webgpu/gpu_device.idl
index 1f694b8ef81a..a32e560b9b5f 100644
--- a/third_party/blink/renderer/modules/webgpu/gpu_device.idl
+++ b/third_party/blink/renderer/modules/webgpu/gpu_device.idl
@@ -17,6 +17,9 @@
[RaisesException] GPUTexture createTexture(GPUTextureDescriptor descriptor);
GPUSampler createSampler(optional GPUSamplerDescriptor descriptor = {});
+ GPURayTracingAccelerationContainer createRayTracingAccelerationContainer(GPURayTracingAccelerationContainerDescriptor descriptor);
+ GPURayTracingShaderBindingTable createRayTracingShaderBindingTable(GPURayTracingShaderBindingTableDescriptor descriptor);
+
[RaisesException] GPUBindGroup createBindGroup(GPUBindGroupDescriptor descriptor);
[RaisesException] GPUBindGroupLayout createBindGroupLayout(GPUBindGroupLayoutDescriptor descriptor);
GPUPipelineLayout createPipelineLayout(GPUPipelineLayoutDescriptor descriptor);
@@ -25,6 +28,8 @@
[CallWith=ScriptState] GPURenderPipeline createRenderPipeline(GPURenderPipelineDescriptor descriptor);
GPUComputePipeline createComputePipeline(GPUComputePipelineDescriptor descriptor);
+ GPURayTracingPipeline createRayTracingPipeline(GPURayTracingPipelineDescriptor descriptor);
+
GPUCommandEncoder createCommandEncoder(optional GPUCommandEncoderDescriptor descriptor = {});
GPURenderBundleEncoder createRenderBundleEncoder(GPURenderBundleEncoderDescriptor descriptor);
diff --git a/third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.cc b/third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.cc
new file mode 100644
index 000000000000..250a57d1a4d0
--- /dev/null
+++ b/third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.cc
@@ -0,0 +1,224 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "third_party/blink/renderer/modules/webgpu/gpu_ray_tracing_acceleration_container.h"
+
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_container_descriptor.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_geometry_descriptor.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_instance_descriptor.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_geometry_vertex_descriptor.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_geometry_index_descriptor.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_geometry_aabb_descriptor.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_ray_tracing_acceleration_instance_transform_descriptor.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_gpu_transform_3d_descriptor.h"
+#include "third_party/blink/renderer/modules/webgpu/gpu_buffer.h"
+#include "third_party/blink/renderer/modules/webgpu/dawn_conversions.h"
+#include "third_party/blink/renderer/modules/webgpu/gpu_device.h"
+
+namespace blink {
+
+ namespace {
+
+ } // anonymous namespace
+
+ // static
+ GPURayTracingAccelerationContainer* GPURayTracingAccelerationContainer::Create(GPUDevice* device,
+ const GPURayTracingAccelerationContainerDescriptor* webgpu_desc) {
+ DCHECK(device);
+ DCHECK(webgpu_desc);
+
+ WGPURayTracingAccelerationContainerDescriptor dawn_desc = {};
+ dawn_desc.usage = static_cast<WGPURayTracingAccelerationContainerUsageFlags>(webgpu_desc->usage());
+ if (webgpu_desc->hasLevel())
+ dawn_desc.level = AsDawnEnum<WGPURayTracingAccelerationContainerLevel>(webgpu_desc->level());
+ else
+ dawn_desc.level = WGPURayTracingAccelerationContainerLevel_Force32;
+
+ uint32_t geometry_count = webgpu_desc->hasGeometries() ? static_cast<uint32_t>(webgpu_desc->geometries().size()) : 0;
+ std::unique_ptr<WGPURayTracingAccelerationGeometryVertexDescriptor[]> vertex_entries(new WGPURayTracingAccelerationGeometryVertexDescriptor[geometry_count]());
+ std::unique_ptr<WGPURayTracingAccelerationGeometryIndexDescriptor[]> index_entries(new WGPURayTracingAccelerationGeometryIndexDescriptor[geometry_count]());
+ std::unique_ptr<WGPURayTracingAccelerationGeometryAabbDescriptor[]> aabb_entries(new WGPURayTracingAccelerationGeometryAabbDescriptor[geometry_count]());
+
+ std::unique_ptr<WGPURayTracingAccelerationGeometryDescriptor[]> geometries(new WGPURayTracingAccelerationGeometryDescriptor[geometry_count]());
+ for (wtf_size_t i = 0; i < geometry_count; ++i) {
+ const GPURayTracingAccelerationGeometryDescriptor* geometry_desc = webgpu_desc->geometries()[i].Get();
+
+ WGPURayTracingAccelerationGeometryDescriptor entry_desc = {};
+ // usage
+ if (geometry_desc->hasUsage())
+ entry_desc.usage = static_cast<WGPURayTracingAccelerationGeometryUsageFlags>(geometry_desc->usage());
+ else
+ entry_desc.usage = WGPURayTracingAccelerationGeometryUsage_None;
+ // type
+ if (geometry_desc->hasType())
+ entry_desc.type = AsDawnEnum<WGPURayTracingAccelerationGeometryType>(geometry_desc->type());
+ else
+ entry_desc.type = WGPURayTracingAccelerationGeometryType_Force32;
+
+ if (geometry_desc->hasVertex()) {
+ if (geometry_desc->vertex()->hasBuffer()) {
+ vertex_entries[i].buffer = AsDawnType(geometry_desc->vertex()->buffer());
+ }
+ vertex_entries[i].format = AsDawnEnum<WGPUVertexFormat>(geometry_desc->vertex()->format());
+ vertex_entries[i].stride = geometry_desc->vertex()->stride();
+ vertex_entries[i].offset = geometry_desc->vertex()->hasOffset() ? geometry_desc->vertex()->offset() : 0;
+ vertex_entries[i].count = geometry_desc->vertex()->count();
+ entry_desc.vertex = &vertex_entries[i];
+ }
+
+ if (geometry_desc->hasIndex()) {
+ if (geometry_desc->index()->hasBuffer()) {
+ index_entries[i].buffer = AsDawnType(geometry_desc->index()->buffer());
+ }
+ index_entries[i].format = AsDawnEnum<WGPUIndexFormat>(geometry_desc->index()->format());
+ index_entries[i].offset = geometry_desc->index()->hasOffset() ? geometry_desc->index()->offset() : 0;
+ index_entries[i].count = geometry_desc->index()->count();
+ entry_desc.index = &index_entries[i];
+ }
+
+ if (geometry_desc->hasAabb()) {
+ if (geometry_desc->aabb()->hasBuffer()) {
+ aabb_entries[i].buffer = AsDawnType(geometry_desc->aabb()->buffer());
+ }
+ aabb_entries[i].stride = geometry_desc->aabb()->stride();
+ aabb_entries[i].offset = geometry_desc->aabb()->hasOffset() ? geometry_desc->aabb()->offset() : 0;
+ aabb_entries[i].count = geometry_desc->aabb()->count();
+ entry_desc.aabb = &aabb_entries[i];
+ }
+
+ geometries[i] = entry_desc;
+ }
+ dawn_desc.geometryCount = geometry_count;
+ dawn_desc.geometries = geometry_count > 0 ? geometries.get() : nullptr;
+
+ uint32_t instance_count = webgpu_desc->hasInstances() ? static_cast<uint32_t>(webgpu_desc->instances().size()) : 0;
+ std::unique_ptr<WGPUTransform3DDescriptor[]> translation_entries(new WGPUTransform3DDescriptor[instance_count]());
+ std::unique_ptr<WGPUTransform3DDescriptor[]> rotation_entries(new WGPUTransform3DDescriptor[instance_count]());
+ std::unique_ptr<WGPUTransform3DDescriptor[]> scale_entries(new WGPUTransform3DDescriptor[instance_count]());
+ std::unique_ptr<WGPURayTracingAccelerationInstanceTransformDescriptor[]> transform_entries(new WGPURayTracingAccelerationInstanceTransformDescriptor[instance_count]());
+
+ std::unique_ptr<WGPURayTracingAccelerationInstanceDescriptor[]> instances(new WGPURayTracingAccelerationInstanceDescriptor[instance_count]());
+ for (wtf_size_t i = 0; i < instance_count; ++i) {
+ const GPURayTracingAccelerationInstanceDescriptor* instance_desc = webgpu_desc->instances()[i].Get();
+
+ WGPURayTracingAccelerationInstanceDescriptor entry_desc = {};
+ // usage
+ if (instance_desc->hasUsage())
+ entry_desc.usage = static_cast<WGPURayTracingAccelerationInstanceUsageFlags>(instance_desc->usage());
+ // mask
+ if (instance_desc->hasMask())
+ entry_desc.mask = instance_desc->mask();
+ // instanceId
+ if (instance_desc->hasInstanceId())
+ entry_desc.instanceId = instance_desc->instanceId();
+ // instanceOffset
+ if (instance_desc->hasInstanceOffset())
+ entry_desc.instanceOffset = instance_desc->instanceOffset();
+ // transform
+ if (instance_desc->hasTransform()) {
+ if (instance_desc->transform()->hasTranslation()) {
+ translation_entries[i].x = instance_desc->transform()->translation()->hasX() ? instance_desc->transform()->translation()->x() : 0;
+ translation_entries[i].y = instance_desc->transform()->translation()->hasY() ? instance_desc->transform()->translation()->y() : 0;
+ translation_entries[i].z = instance_desc->transform()->translation()->hasZ() ? instance_desc->transform()->translation()->z() : 0;
+ }
+ if (instance_desc->transform()->hasRotation()) {
+ rotation_entries[i].x = instance_desc->transform()->rotation()->hasX() ? instance_desc->transform()->rotation()->x() : 0;
+ rotation_entries[i].y = instance_desc->transform()->rotation()->hasY() ? instance_desc->transform()->rotation()->y() : 0;
+ rotation_entries[i].z = instance_desc->transform()->rotation()->hasZ() ? instance_desc->transform()->rotation()->z() : 0;
+ }
+ if (instance_desc->transform()->hasScale()) {
+ scale_entries[i].x = instance_desc->transform()->scale()->hasX() ? instance_desc->transform()->scale()->x() : 0;
+ scale_entries[i].y = instance_desc->transform()->scale()->hasY() ? instance_desc->transform()->scale()->y() : 0;
+ scale_entries[i].z = instance_desc->transform()->scale()->hasZ() ? instance_desc->transform()->scale()->z() : 0;
+ }
+ transform_entries[i].translation = &translation_entries[i];
+ transform_entries[i].rotation = &rotation_entries[i];
+ transform_entries[i].scale = &scale_entries[i];
+ entry_desc.transform = &transform_entries[i];
+ }
+ // transform matrix
+ entry_desc.transformMatrix = instance_desc->hasTransformMatrix() ? instance_desc->transformMatrix()->Data() : nullptr;
+ if (instance_desc->hasTransformMatrixSize())
+ entry_desc.transformMatrixSize = instance_desc->transformMatrixSize();
+ // geometry container
+ entry_desc.geometryContainer = AsDawnType(instance_desc->geometryContainer());
+
+ instances[i] = entry_desc;
+ }
+ dawn_desc.instanceCount = instance_count;
+ dawn_desc.instances = instance_count > 0 ? instances.get() : nullptr;
+
+ return MakeGarbageCollected<GPURayTracingAccelerationContainer>(
+ device,
+ device->GetProcs().deviceCreateRayTracingAccelerationContainer(device->GetHandle(), &dawn_desc));
+ }
+
+ GPURayTracingAccelerationContainer::GPURayTracingAccelerationContainer(GPUDevice* device, WGPURayTracingAccelerationContainer acceleration_container)
+ : DawnObject<WGPURayTracingAccelerationContainer>(device, acceleration_container) {}
+
+ GPURayTracingAccelerationContainer::~GPURayTracingAccelerationContainer() {
+ if (IsDawnControlClientDestroyed()) {
+ return;
+ }
+ GetProcs().rayTracingAccelerationContainerRelease(GetHandle());