Ray tracing compaction #6609
Open
Ray tracing compaction #6609
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # naga/src/back/spv/writer.rs # wgpu-core/src/hub.rs # wgpu-core/src/registry.rs # wgpu/src/backend/wgpu_core.rs
fix validation
Merge commit 'fb3b33d09233140533a9e431256a8690bf4c5d42' from wgpu/trunk into ray-tracing
…rds do not support (and it now works!) currently missing validation
…cing-updated # Conflicts: # Cargo.lock # wgpu-core/src/command/mod.rs # wgpu-core/src/device/resource.rs # wgpu-core/src/track/mod.rs # wgpu-core/src/validation.rs # wgpu/src/backend/webgpu.rs # wgpu/src/context.rs
…cing-updated # Conflicts: # wgpu-core/src/command/compute.rs # wgpu-core/src/track/mod.rs
…rs (not the tlas_s)
# Conflicts: # .gitattributes # examples/src/ray_cube_compute/mod.rs # examples/src/ray_cube_fragment/mod.rs # examples/src/ray_scene/mod.rs # wgpu-core/src/command/compute.rs # wgpu-core/src/command/ray_tracing.rs # wgpu-core/src/device/life.rs # wgpu-core/src/device/queue.rs # wgpu-core/src/device/ray_tracing.rs # wgpu-core/src/device/resource.rs # wgpu-core/src/hub.rs # wgpu-core/src/track/mod.rs # wgpu/src/backend/webgpu.rs # wgpu/src/backend/wgpu_core.rs
|
Moving into draft as https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32616 seems to be taking some time to be merged. Edit: it has merged, now waiting on the next steps (see description) |
# Conflicts: # CHANGELOG.md # examples/src/ray_cube_compute/mod.rs # tests/tests/ray_tracing/as_build.rs # wgpu-core/src/command/ray_tracing.rs # wgpu-core/src/device/life.rs # wgpu-core/src/device/queue.rs # wgpu-core/src/device/ray_tracing.rs # wgpu-core/src/ray_tracing.rs # wgpu-core/src/track/ray_tracing.rs # wgpu-hal/src/dx12/command.rs # wgpu/src/api/command_encoder.rs
…vice was being lost (turns out dx12 puts copies dst then src). :(
|
I've decided that instead of waiting I'll add llvmpipe to be skipped as it is at fault not this code. |
|
Mesa has released the patch in v24.3.4 https://docs.mesa3d.org/relnotes/24.3.4.html |
|
That's great! I'll open an issue for CI to be updated. |
# Conflicts: # CHANGELOG.md # tests/tests/ray_tracing/as_build.rs # wgpu-core/src/command/ray_tracing.rs # wgpu-core/src/device/ray_tracing.rs # wgpu-hal/src/dx12/command.rs # wgpu-hal/src/dx12/conv.rs # wgpu-hal/src/lib.rs # wgpu/src/api/command_encoder.rs # wgpu/src/backend/webgpu.rs # wgpu/src/backend/wgpu_core.rs # wgpu/src/dispatch.rs
# Conflicts: # CHANGELOG.md # tests/tests/ray_tracing/as_build.rs # wgpu-core/src/command/ray_tracing.rs # wgpu-core/src/device/ray_tracing.rs # wgpu-hal/src/dx12/command.rs # wgpu-hal/src/dx12/conv.rs # wgpu-hal/src/lib.rs # wgpu/src/api/command_encoder.rs # wgpu/src/backend/webgpu.rs # wgpu/src/backend/wgpu_core.rs # wgpu/src/dispatch.rs
…-tracing-compaction # Conflicts: # wgpu-core/src/device/ray_tracing.rs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Connections
Follow up to #6291
This is entirely able to be reviewed.
Description
Adds the function
compact_blasas specified in #1040. This needed two more functions in wgpu-hal. These are based on DX12 and the function callEmitRaytracingAccelerationStructurePostbuildInfo(). On Vulkan this call is emulated with query sets. Compaction does not need any additional featues. Depending on the GPU and BLAS contents compaction may not be possible. In that case the BLAS will be duplicated (logic done by GPU driver).This change is shown by ray_cube_compute, which now compacts the BLAS before using it. This shows the requirements of the function.
Testing
Adds two more tests, testing valid and invalid compaction operations.
Checklist
cargo fmt.taplo format. - done by CIcargo clippy. If applicable, add:--target wasm32-unknown-unknown--target wasm32-unknown-emscriptencargo xtask testto run tests.CHANGELOG.md. See simple instructions inside file.