Support DXR in wgpu-hal & naga. #6777

Vecvec · 2024-12-18T01:17:48Z

Connections
Might provide alternatives for #6727?

Description
This adds support for DXR in wgpu-hal. Also removes an unnecessary feature requirement from ray_cube_compute as this was preventing it from running on DX12. Also adds support for HLSL raytracing because naga didn't have that either.

Testing
this only extends feature support to dx12 so all previous rt tests work.

Checklist

Run cargo fmt.
Run taplo format.
Run cargo clippy. If applicable, add:
- [n/a] --target wasm32-unknown-unknown
- [n/a] --target wasm32-unknown-emscripten
Run cargo xtask test to run tests.
Add change to CHANGELOG.md. See simple instructions inside file.

…tracing

…tracing # Conflicts: # naga/src/back/hlsl/writer.rs # wgpu-hal/src/dx12/device.rs

…RUCTURE` as we don't yet support enhanced barriers for acceleration structures

…tracing

…ection function

Elabajaba · 2024-12-18T03:07:30Z

I ran the tests for this and it doesn't appear to be working properly? (6800xt/RDNA2 has RT support, I ran $env:WGPU_BACKEND="dx12" then cargo xtask test -- ray_tracing)

        PASS [   0.076s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_build::unbuilt_blas
        PASS [   0.075s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::scene::acceleration_structure_build_no_index
        PASS [   0.075s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_build::out_of_order_as_build_use
        PASS [   0.076s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_build::out_of_order_as_build
        PASS [   0.089s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_use_after_free::acceleration_structure_use_after_free
        PASS [   0.089s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_build::out_of_order_as_build
        PASS [   0.088s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::scene::acceleration_structure_build_with_index
        PASS [   0.088s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::scene::acceleration_structure_build_no_index
        PASS [   0.088s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_build::unbuilt_blas
        PASS [   0.088s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_build::out_of_order_as_build_use
        PASS [   0.100s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_build::empty_build
        PASS [   0.095s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_build::empty_build
        PASS [   0.100s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_create::blas_invalid_vertex_format
        PASS [   0.095s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/0] wgpu_test::ray_tracing::as_create::blas_mismatched_index
        PASS [   0.101s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::scene::acceleration_structure_build_with_index
        PASS [   0.103s] wgpu-test::wgpu-test [Skipped Failure: ADAPTER] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_use_after_free::acceleration_structure_use_after_free
        PASS [   0.106s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_create::blas_mismatched_index
        PASS [   0.110s] wgpu-test::wgpu-test [Unsupported: Features] [Dx12/AMD Radeon RX 6800 XT/1] wgpu_test::ray_tracing::as_create::blas_invalid_vertex_format

edit: This is probably #6728, I'll try reverting that and see if it works.

edit2: Nope, reverted that and it's now saying [Unsupported: Features] for all of the tests.

edit3: Looks like you need to set the WGPU_DX12_COMPILER environment variable to either dxc or static-dxc for it to work, as it otherwise defaults to FXC. All the ray_tracing tests passed once I set it to either dxc (with the .dlls in my wgpu root dir) or static-dxc.

cwfitzgerald · 2024-12-18T03:39:08Z

Looks like you need to set the WGPU_DX12_COMPILER environment variable to either dxc or static-dxc for it to work, as it otherwise defaults to FXC. All the ray_tracing tests passed once I set it to either dxc (with the .dlls in my wgpu root dir) or static-dxc.

This should now default to static-dxc after #6730

Vecvec · 2024-12-18T06:00:48Z

All the ray_tracing tests passed once I set it to either dxc (with the .dlls in my wgpu root dir) or static-dxc.

Since that's on a AMD GPU, that means that this probably does provide an alternative (and may also point to the issue being a wgpu bug vs a AMD bug)

Edit: I'm not sure what GPU generations were being affected though.

cwfitzgerald · 2024-12-18T19:29:06Z

Same, my 7800xtx passes all tests

cwfitzgerald · 2024-12-18T19:36:14Z

Both testing issues fixed in #6781 and #6782

…ect value.

cwfitzgerald

Super cool to see! Lots of comments, but nothing show stopping!

wgpu-hal/examples/ray-traced-triangle/main.rs

wgpu-hal/src/dx12/adapter.rs

wgpu-hal/src/dx12/command.rs

cwfitzgerald · 2024-12-23T23:38:45Z

wgpu-hal/src/dx12/command.rs

+                                Triangles: Direct3D12::D3D12_RAYTRACING_GEOMETRY_TRIANGLES_DESC {
+                                    Transform3x4: triangle.transform.as_ref().map_or(
+                                        0,
+                                        |transform| unsafe {
+                                            transform.buffer.resource.GetGPUVirtualAddress()
+                                                + transform.offset as u64
+                                        },
+                                    ),
+                                    IndexFormat: triangle
+                                        .indices
+                                        .as_ref()
+                                        .map_or(Dxgi::Common::DXGI_FORMAT_UNKNOWN, |indices| {
+                                            conv::map_index_format(indices.format)
+                                        }),
+                                    VertexFormat: conv::map_acceleration_structure_vertex_format(
+                                        triangle.vertex_format,
+                                    ),
+                                    IndexCount: triangle
+                                        .indices
+                                        .as_ref()
+                                        .map_or(0, |indices| indices.count),
+                                    VertexCount: triangle.vertex_count,
+                                    IndexBuffer: triangle.indices.as_ref().map_or(
+                                        0,
+                                        |indices| unsafe {
+                                            indices
+                                                .buffer
+                                                .expect("needs buffer to build")
+                                                .resource
+                                                .GetGPUVirtualAddress()
+                                                + indices.offset as u64
+                                        },
+                                    ),


Can we pull all of these complex assignments out of the struct init and make them local variables in the for loop - we can then have a place for computation and a place for initializing the struct. Should help reduce rightward creep too.

This applies broadly for other places in the PR too - give a pass over and see if right shift can be reduced.

I think I've addressed this here (and also in the similar version in get_acceleration_structure_build_sizes), but you may have a different opinion. I'll keep this unresolved.

wgpu-hal/src/dx12/command.rs

wgpu-hal/src/dx12/conv.rs

wgpu-hal/src/dx12/device.rs

wgpu-hal/src/dx12/suballocation.rs

wgpu-types/src/counters.rs

CHANGELOG.md

Vecvec added 30 commits September 9, 2024 17:19

implement device calls

4be11ec

implement todo and fmt

647ddd0

properly implement todo and fix other clippy errors

0d0b2ab

don't use buffers in getting build sizes

f91a482

fmt

951d437

implement commands

f017080

fix errors

23cc3a1

implement hlsl out

6a2f362

fix clippy warnings

7e2fc34

fix CI errors

2350e04

fix CI errors #2

4bdf0ed

fix CI errors #3

1750afb

fix CI errors #4

45ec097

fix CI errors #5

275d082

check for sm 6.5

3cc9801

implement rest of direct x ray queries

dd99a08

fix issues with ray-traced triangle

499fa9b

clippy & fmt

4f762e0

Merge remote-tracking branch 'refs/remotes/gfx-rs/trunk' into dx-ray-…

f92221d

…tracing

Merge remote-tracking branch 'refs/remotes/gfx-rs/trunk' into dx-ray-…

0877129

…tracing # Conflicts: # naga/src/back/hlsl/writer.rs # wgpu-hal/src/dx12/device.rs

fix merge

7576bbe

fix build

44f73e6

remove unused import

02c8699

don't use `Direct3D12::D3D12_RESOURCE_FLAG_RAYTRACING_ACCELERATION_ST…

19caada

…RUCTURE` as we don't yet support enhanced barriers for acceleration structures

support candidate intersections

2493f04

write out values of constants, not their wgsl names.

3810051

format

d6a4fee

Merge remote-tracking branch 'refs/remotes/gfx-rs/trunk' into dx-ray-…

ef1ffd7

…tracing

fix merge

8a88223

remove println!

f74a6da

Vecvec mentioned this pull request Dec 18, 2024

Ray Tracing Tracking Issue #6762

Open

22 tasks

Vecvec and others added 6 commits December 18, 2024 14:31

Merge branch 'trunk' into dx-ray-tracing

1506561

Changelog

a66ebcf

Correctly use candidate instead of committed int the candidate inters…

f93a97d

…ection function

swap the instance calls because have different names

def77b5

fmt

93f700b

regen snapshots

31715f4

Merge branch 'trunk' into dx-ray-tracing

f46ec3c

cwfitzgerald assigned jimblandy and cwfitzgerald Dec 18, 2024

Merge branch 'trunk' into dx-ray-tracing

0de5a51

cwfitzgerald and others added 4 commits December 18, 2024 16:59

Merge branch 'trunk' into dx-ray-tracing

3b89172

Merge branch 'trunk' into dx-ray-tracing

72676fc

Merge branch 'trunk' into dx-ray-tracing

45ed3f3

remove layout variable (all paths lead to the same value). Fix incorr…

0aeed65

…ect value.

cwfitzgerald requested changes Dec 23, 2024

View reviewed changes

Vecvec and others added 5 commits December 24, 2024 16:08

begin addressing comments

9c54f4f

address comments

0665c93

Merge branch 'trunk' into dx-ray-tracing

31c6990

use rgba8

c5fdde4

Merge branch 'trunk' into dx-ray-tracing

d86619d

Vecvec mentioned this pull request Dec 26, 2024

Use enhanced barriers on dx12 (where possible) #6829

Open

MarijnS95 reviewed Dec 27, 2024

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Vecvec and others added 2 commits December 30, 2024 09:32

clarify that DXR means DirectX Ray-tracing

06fec21

Merge branch 'trunk' into dx-ray-tracing

0093945

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support DXR in wgpu-hal & naga. #6777

Support DXR in wgpu-hal & naga. #6777

Vecvec commented Dec 18, 2024 •

edited

Loading

Elabajaba commented Dec 18, 2024 •

edited

Loading

cwfitzgerald commented Dec 18, 2024

Vecvec commented Dec 18, 2024 •

edited

Loading

cwfitzgerald commented Dec 18, 2024

cwfitzgerald commented Dec 18, 2024

cwfitzgerald left a comment

cwfitzgerald Dec 23, 2024

cwfitzgerald Dec 23, 2024

Vecvec Dec 24, 2024

Support DXR in wgpu-hal & naga. #6777

Are you sure you want to change the base?

Support DXR in wgpu-hal & naga. #6777

Conversation

Vecvec commented Dec 18, 2024 • edited Loading

Elabajaba commented Dec 18, 2024 • edited Loading

cwfitzgerald commented Dec 18, 2024

Vecvec commented Dec 18, 2024 • edited Loading

cwfitzgerald commented Dec 18, 2024

cwfitzgerald commented Dec 18, 2024

cwfitzgerald left a comment

Choose a reason for hiding this comment

cwfitzgerald Dec 23, 2024

Choose a reason for hiding this comment

cwfitzgerald Dec 23, 2024

Choose a reason for hiding this comment

Vecvec Dec 24, 2024

Choose a reason for hiding this comment

Vecvec commented Dec 18, 2024 •

edited

Loading

Elabajaba commented Dec 18, 2024 •

edited

Loading

Vecvec commented Dec 18, 2024 •

edited

Loading