[wgpu-hal] Inline RayQuery Support #3507

daniel-keitel · 2023-02-20T15:56:34Z

Checklist

Run cargo clippy.
Run RUSTFLAGS=--cfg=web_sys_unstable_apis cargo clippy --target wasm32-unknown-unknown if applicable.
Add change to CHANGELOG.md. See simple instructions inside file.
Consider unsafe_ops_in_unsafe_fn Enable unsafe_ops_in_unsafe_fn lint in all workspaces #3044
Consider DX12 for API compatibility
Acceleration Structure Updates

Future Work

Acceleration Structure Compaction
DX 12 Implementation
Ray Tracing Pipeline [wgpu-hal] Initial Vulkan ray tracing pipeline support #3607

Connections
#1040
#3020 original PR
gfx-rs/naga#2256

Description
Basic Vulkan ray query and acceleration structure support.

This pull request is the continuation of @expenses PR #3020.

The Api is designed to work with a DirectX12 Implementation.

Testing
Tested with example application (ray-traced-triangle)

…ructures

…y implementation, run cargo clippy, fix wgpu/wgpu build

…me links to implementation resources.

…ructures

…u into hal-acceleration-structures

expenses · 2023-02-20T18:41:33Z

Just did a brief look over this again - I think the code is fine but the suggestions from the original PR should probably still be applied.

…ructures

daniel-keitel · 2023-02-22T06:17:11Z

All suggestions from the original PR: #3020 (review)
are applied. All other comments where considered and resulted in code changes.

I will look over the API differences between Vulkan and DX12 Before I consider this PR "Ready for review".

+ seperated RAY_QUERY

daniel-keitel · 2023-09-15T18:40:33Z

It is ready for review, after I had a look at the failed tests.

cwfitzgerald

Sorry for taking so long to review this, we'll be better about this going forward.

This looks great! Some smaller nits and needs a rebase, but let's get this in!

wgpu-hal/Cargo.toml

wgpu-hal/examples/ray-traced-triangle/shader.comp

wgpu-hal/src/vulkan/device.rs

wgpu-hal/src/vulkan/command.rs

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

…ructures

cwfitzgerald · 2023-11-15T21:35:14Z

(Please re-request my review when changes are addressed!)

JMS55 · 2023-12-01T01:02:47Z

Looks like this PR needs rebasing btw. Happy to see more progress on it though, thank you!

…ructures

…tructures

Co-authored-by: JMS55 <[email protected]> Co-authored-by: Ashley Ruglys <[email protected]> Co-authored-by: Connor Fitzgerald <[email protected]>

…eb3c29ef785. r=webgpu-reviewers,supply-chain-reviewers,jimb # Changelog * #4807 Bump wasm-bindgen-test from 0.3.38 to 0.3.39 By dependabot[bot] in gfx-rs/wgpu#4807 * #4830 Use Display instead of Debug to log errors. By nical in gfx-rs/wgpu#4830 * #4755 [naga wgsl-in] Automatic conversions for `var` initializers. By jimblandy in gfx-rs/wgpu#4755 * #4755 [naga wgsl-in] Automatic conversions for `var` initializers. By jimblandy in gfx-rs/wgpu#4755 * #4755 [naga wgsl-in] Automatic conversions for `var` initializers. By jimblandy in gfx-rs/wgpu#4755 * #4832 vulkan: fix multi-planar texture creation By xiaopengli89 in gfx-rs/wgpu#4832 * #4758 [vk] remove (old) unused blocklist for dual source blending By teoxoy in gfx-rs/wgpu#4758 * #4828 Remove DX11 backend By valaphee in gfx-rs/wgpu#4828 * #4836 [gl] add support for line and point polygon modes By valaphee in gfx-rs/wgpu#4836 * #4820 Bump futures-lite from 2.0.1 to 2.1.0 By dependabot[bot] in gfx-rs/wgpu#4820 * #4811 Expose shader validation By daxpedda in gfx-rs/wgpu#4811 * #3507 [wgpu-hal] Inline RayQuery Support By daniel-keitel in gfx-rs/wgpu#3507 * #4726 Fix Javascript exception on repeated `BufferSlice::get_mapped_range` calls By DouglasDwyer in gfx-rs/wgpu#4726 * #4841 Remove `expose-ids` Feature By cwfitzgerald in gfx-rs/wgpu#4841 * #4843 Some Minor `wgpu-core` Cleanups By cwfitzgerald in gfx-rs/wgpu#4843 * #4844 Work around cbindgen issue By nical in gfx-rs/wgpu#4844 Differential Revision: https://phabricator.services.mozilla.com/D195735

…eb3c29ef785. r=webgpu-reviewers,supply-chain-reviewers,jimb # Changelog * #4807 Bump wasm-bindgen-test from 0.3.38 to 0.3.39 By dependabot[bot] in gfx-rs/wgpu#4807 * #4830 Use Display instead of Debug to log errors. By nical in gfx-rs/wgpu#4830 * #4755 [naga wgsl-in] Automatic conversions for `var` initializers. By jimblandy in gfx-rs/wgpu#4755 * #4755 [naga wgsl-in] Automatic conversions for `var` initializers. By jimblandy in gfx-rs/wgpu#4755 * #4755 [naga wgsl-in] Automatic conversions for `var` initializers. By jimblandy in gfx-rs/wgpu#4755 * #4832 vulkan: fix multi-planar texture creation By xiaopengli89 in gfx-rs/wgpu#4832 * #4758 [vk] remove (old) unused blocklist for dual source blending By teoxoy in gfx-rs/wgpu#4758 * #4828 Remove DX11 backend By valaphee in gfx-rs/wgpu#4828 * #4836 [gl] add support for line and point polygon modes By valaphee in gfx-rs/wgpu#4836 * #4820 Bump futures-lite from 2.0.1 to 2.1.0 By dependabot[bot] in gfx-rs/wgpu#4820 * #4811 Expose shader validation By daxpedda in gfx-rs/wgpu#4811 * #3507 [wgpu-hal] Inline RayQuery Support By daniel-keitel in gfx-rs/wgpu#3507 * #4726 Fix Javascript exception on repeated `BufferSlice::get_mapped_range` calls By DouglasDwyer in gfx-rs/wgpu#4726 * #4841 Remove `expose-ids` Feature By cwfitzgerald in gfx-rs/wgpu#4841 * #4843 Some Minor `wgpu-core` Cleanups By cwfitzgerald in gfx-rs/wgpu#4843 * #4844 Work around cbindgen issue By nical in gfx-rs/wgpu#4844 Differential Revision: https://phabricator.services.mozilla.com/D195735 UltraBlame original commit: 0dfeaf41028d13f9dd98b106e262c1deb255398d

expenses and others added 16 commits September 3, 2022 15:28

Initial commit

cd16e71

Woo! building an AS works

ae4dcfe

Fix alignment for amdpro driver

98cf75b

Ray tracing works in shaders!

6655d23

Merge remote-tracking branch 'origin/master' into hal-acceleration-st…

3be84cb

…ructures

Major clean up, allow for acceleration structure updates

2cc4385

Fix trait implementaiton on gles

cd7c807

Put larger function call param lists into descriptors for easier dumm…

4ef32a4

…y implementation, run cargo clippy, fix wgpu/wgpu build

Fix wasm build

8318b5f

Shuffle some code around, add a dummy implementation for DX12 with so…

fecb538

…me links to implementation resources.

Add dummy implementation for metal

7905dc5

Merge remote-tracking branch 'origin/master' into hal-acceleration-st…

e786743

…ructures

Fix example, hopefully have fixed metal code

6f2b07a

Merge branch 'hal-acceleration-structures' of github.com:expenses/wgp…

9aca7f2

…u into hal-acceleration-structures

Changed surface_format in example.

3828af7

Changed based on PR 3020#pullrequestreview-1139691697 feedback.

e2de5a3

daniel-keitel added 4 commits February 21, 2023 22:30

Merge remote-tracking branch 'origin/master' into hal-acceleration-st…

112b549

…ructures

unsafe blocks in unsafe functions

074ebe5

formatted code

8ce204b

added utility functions to AccelerationStructureInstance (bit packing)

f52a70b

daniel-keitel mentioned this pull request Feb 25, 2023

Ray Tracing Support #1040

Closed

daniel-keitel added 6 commits February 27, 2023 14:32

WIP api change build_acceleration_structures

f15e865

preperation for changes in get_acceleration_structure_build_sizes

a3c0ffb

WIP api change get_acceleration_structure_build_sizes

a59d888

added aabbs and geometry flag support

93a347d

fixed RAY_TRACING feature collision

16cc4eb

+ seperated RAY_QUERY

renamed to build_acceleration_structure

5b84238

daniel-keitel marked this pull request as ready for review March 1, 2023 07:27

cwfitzgerald added PR: waiting for review and removed PR: waiting for author labels Sep 15, 2023

Merge branch 'trunk' into hal-acceleration-structures

a919529

teoxoy added PR: waiting for author and removed PR: waiting for review labels Sep 15, 2023

fixed rt hal example after trunk merge

a09d116

teoxoy added PR: waiting for review and removed PR: waiting for author labels Sep 18, 2023

cwfitzgerald requested a review from a team September 20, 2023 18:50

theHamsta mentioned this pull request Oct 3, 2023

Ray tracing support? bevyengine/bevy#639

Open

cwfitzgerald removed the PR: waiting for review label Oct 4, 2023

cwfitzgerald requested changes Oct 29, 2023

View reviewed changes

Merge remote-tracking branch 'origin/master' into hal-acceleration-st…

34995ae

…ructures

implemented requested changes

77acca5

Merge remote-tracking branch 'origin/master' into hal-acceleration-st…

efc6d90

…ructures

cwfitzgerald self-requested a review December 6, 2023 20:39

cwfitzgerald approved these changes Dec 6, 2023

View reviewed changes

Merge remote-tracking branch 'upstream/trunk' into hal-acceleration-s…

8209991

…tructures

cwfitzgerald enabled auto-merge (squash) December 6, 2023 20:53

cwfitzgerald merged commit 0f4df52 into gfx-rs:trunk Dec 6, 2023
27 checks passed

bradwerth pushed a commit to bradwerth/wgpu that referenced this pull request Dec 8, 2023

[wgpu-hal] Inline RayQuery Support (gfx-rs#3507)

6f75c54

Co-authored-by: JMS55 <[email protected]> Co-authored-by: Ashley Ruglys <[email protected]> Co-authored-by: Connor Fitzgerald <[email protected]>

teoxoy mentioned this pull request Apr 10, 2024

[wgpu-hal] Upgrade to ash 0.38 #5504

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[wgpu-hal] Inline RayQuery Support #3507

[wgpu-hal] Inline RayQuery Support #3507

daniel-keitel commented Feb 20, 2023 •

edited

Loading

expenses commented Feb 20, 2023

daniel-keitel commented Feb 22, 2023

daniel-keitel commented Sep 15, 2023

cwfitzgerald left a comment

cwfitzgerald commented Nov 15, 2023

JMS55 commented Dec 1, 2023

[wgpu-hal] Inline RayQuery Support #3507

[wgpu-hal] Inline RayQuery Support #3507

Conversation

daniel-keitel commented Feb 20, 2023 • edited Loading

expenses commented Feb 20, 2023

daniel-keitel commented Feb 22, 2023

daniel-keitel commented Sep 15, 2023

cwfitzgerald left a comment

Choose a reason for hiding this comment

cwfitzgerald commented Nov 15, 2023

JMS55 commented Dec 1, 2023

daniel-keitel commented Feb 20, 2023 •

edited

Loading