Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support DXR in wgpu-hal & naga. #6777

Merged
merged 59 commits into from
Jan 15, 2025
Merged

Conversation

Vecvec
Copy link
Contributor

@Vecvec Vecvec commented Dec 18, 2024

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.

@cwfitzgerald
Copy link
Member

Same, my 7800xtx passes all tests

@cwfitzgerald
Copy link
Member

Both testing issues fixed in #6781 and #6782

Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

wgpu-hal/examples/ray-traced-triangle/main.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/adapter.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/command.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/command.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/command.rs Show resolved Hide resolved
wgpu-hal/src/dx12/conv.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/conv.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/device.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/suballocation.rs Show resolved Hide resolved
wgpu-types/src/counters.rs Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code transforms look solid, some final nits

wgpu-hal/src/dx12/command.rs Show resolved Hide resolved
wgpu-hal/src/dx12/device.rs Outdated Show resolved Hide resolved
wgpu-hal/src/dx12/device.rs Outdated Show resolved Hide resolved
Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments

wgpu-hal/src/dx12/command.rs Outdated Show resolved Hide resolved
naga/src/back/hlsl/writer.rs Show resolved Hide resolved
naga/src/back/hlsl/ray.rs Show resolved Hide resolved
Copy link
Member

@cwfitzgerald cwfitzgerald left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to cautiously accept this on behalf of both wgpu and naga.

Thanks for the work!

@cwfitzgerald cwfitzgerald merged commit 21de7f7 into gfx-rs:trunk Jan 15, 2025
30 checks passed
@cwfitzgerald cwfitzgerald deleted the dx-ray-tracing branch January 15, 2025 02:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants