Merge with trunk #3

Vecvec · 2024-06-16T04:49:22Z

Connections

Description
merges with trunk again, there were some ray-tracing bugs in wgpu-hal that were fixed

Testing
CI is fine, and the only error when I run the examples on my machine is about the blas format (see gfx-rs#3631 (comment))

Checklist

Run cargo fmt.
Run cargo clippy. If applicable, add:
- --target wasm32-unknown-unknown ray-tracing is not on the web
- --target wasm32-unknown-emscripten
Run cargo xtask test to run tests. - done by CI
Add change to CHANGELOG.md. See simple instructions inside file. part of ray-tracing

Otherwise, the emojis aren't parsed on Crates.io, leaving the table without much utility unless a user navigates to GitHub. Fixes like these are very simple, but super helpful for some users! :)

- Improve logging in `StatelessTracker::remove_abandoned` to show the outcome of the call. - Add similar logging to `BufferTracker` and `TextureTracker`. - Let `device_create_buffer`'s log only the new buffer's label, id, and whether it's mapped at creation. It used to show the whole descriptor, which is too much detail. - Have `queue_submit` log the submission id, and have `device_poll` log what it was waiting for, and what actually got done. - Have `Device::drop` log the destruction of the raw device when it actually happens, so it's properly ordered with respect to logging from other parts of the device, like `Device::command_allocator`.

* Ensure webgl example build only contains webgl and webgpu example build only contains webgpu * fix ip printed on run-wasm * Update examples on running examples on the web

… already)

…valid ID errors

…ope.merge_single`

…4.6.3 (gfx-rs#5921) Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.6.1 to 4.6.3. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.6.1...v4.6.3) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Expose gpu allocation configuration options This commit adds hints to control memory allocations strategies to the configuration options. These hints allow for automatic profiles such as optimizing for performance (the default, makes sense for a game), optimizing for memory usage (typically more useful for a web browser or UI library) and specifying settings manually. The details of gpu allocation are still in flux. The goal is to switch vulkan and metal to gpu_allocator which is currently used with d3d12. gpu_allocator will also likely receive more configuration options, in particular the ability to start with smaller memory block sizes and progressively grow the block size. So the manual settings already provision for this upcoming option. Another approach could be to wait and add the manual option after the dust settles. The reason for providing presets and defining values in the backends is that I am convinced that optimal fonigurations should take hardware capabilities into consideration. It's a deep rabbithole, though, so that will be an exercise for later. * changelog * Update CHANGELOG.md Co-authored-by: Andreas Reich <[email protected]> * Add a comment about not entirely knowing what we are doing --------- Co-authored-by: Andreas Reich <[email protected]>

…ources. It's worth noting that `suspected_resources` never contained those resources.

The Vec only ever contained 0 or 1 command buffers. We now acquire an encoder on every submit for pending writes but that's not a problem since those are coming from a pool anyway.

…ive in `LifetimeTracker.handle_mapping` This change doesn't change behavior as `Global.buffer_drop` already unmaps the buffer.

…cing-updated # Conflicts: # wgpu-core/src/device/life.rs # wgpu-core/src/device/queue.rs # wgpu-core/src/device/resource.rs

atlv24 · 2024-07-26T06:03:30Z

Thanks for this

teoxoy and others added 30 commits June 19, 2024 14:05

introduce Device.check_is_valid

edc2cd9

move most device validity checks inside the device's methods

4b5666c

move command encoder/buffer creation in a new device method

0b7a5b0

move map_async body in a new buffer method

cc7b2db

reorder map_async validation steps

284c807

docs(readme): use emoji literals instead of shortcodes (gfx-rs#5843)

d4b3856

Otherwise, the emojis aren't parsed on Crates.io, leaving the table without much utility unless a user navigates to GitHub. Fixes like these are very simple, but super helpful for some users! :)

Fix web example build (gfx-rs#5832)

7b89b6d

* Ensure webgl example build only contains webgl and webgpu example build only contains webgpu * fix ip printed on run-wasm * Update examples on running examples on the web

replace uses of Id.backend() with A::VARIANT

43177d7

remove TextureBindGroupState.add_single's return type

8d805c9

make clear_texture_via_render_passes infallible (in practice it was…

2a7f09a

… already)

remove usage of Texture IDs in clear code

8465a64

remove usage of Buffer IDs in clear code

a21bbdc

use Arc::ptr_eq for resource equality

0c4b449

use the tracker index as key in hashmap instead of ID

836f016

use error_ident for log instead of ID

068da49

make check_buffer_usage a buffer method

87382d7

make check_texture_usage a texture method

862f195

simplify BufferTracker.set_single's return type

a979d2e

remove IDs from StatelessBindGroupState

6a181fa

take buffer lookup out of BufferBindGroupState.add_single

d221839

make return type of TextureTracker.set_single non-optional

97a038a

consolidate destroyed texture/buffer errors and separate them from in…

a024afe

…valid ID errors

remove old comment

2ec7254

take resource lookup out of StatelessTracker.add_single

7bd9195

introduce TextureView.try_raw

08f5eb8

change BindGroup.raw to BindGroup.try_raw

b0d2517

remove ID from QueueSubmitError::BufferStillMapped

f507226

take resource lookup out of BufferUsageScope.merge_single

aaec1c3

move body of BufferUsageScope.insert_merge_single in `BufferUsageSc…

26eceab

…ope.merge_single`

dependabot bot and others added 28 commits July 8, 2024 09:42

chore(clippy): satisfy unused_qualifications

2cffa1d

Add cfg_alias indirection to Naga's x_out features

89c3baf

Introduce msl-out-if-target-apple feature to Naga

e1913b1

Introduce hlsl-out-if-target-windows feature to Naga

7c51bb4

remove unused TempResource::Texture

bd2b284

change prepare_staging_buffer to return a non null u8 pointer

5266bd1

use StagingBuffer instead of Buffer for mapped_at_creation Buffers

fabbca2

remove unused TempResource::Buffer

ab88dce

remove Device.create_buffer_impl

ef909d0

remove Arcs around TempResource variants

7223bfa

add ActiveSubmission.temp_resources that contains all temporary res…

c6761bd

…ources. It's worth noting that `suspected_resources` never contained those resources.

remove device_maintain_ids

1404950

move trackers into EncoderInFlight on submit

439e28b

remove PendingWrites.executing_command_buffers

61739d9

The Vec only ever contained 0 or 1 command buffers. We now acquire an encoder on every submit for pending writes but that's not a problem since those are coming from a pool anyway.

remove LifetimeTracker.future_suspected_{buffers,textures}

3cc6c27

don't check if the buffer is still "present" from the user's perspect…

3fba403

…ive in `LifetimeTracker.handle_mapping` This change doesn't change behavior as `Global.buffer_drop` already unmaps the buffer.

remove the triage suspected machinery

3142e15

replace the tracker in Device with a new DeviceTracker

0e1c1f7

make resource metadata generic over a T: Clone

a270577

remove unnecessary PhantomData

152a7e7

remove unused BufferTracker.get()

ac88c73

don't call drain_transitions() of we drop the results

f5a4489

introduce DeviceBufferTracker which holds weak references to buffers

aa9cb71

introduce DeviceTextureTracker which holds weak references to textures

4255268

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

4afba3b

…cing-updated # Conflicts: # wgpu-core/src/device/life.rs # wgpu-core/src/device/queue.rs # wgpu-core/src/device/resource.rs

fix merge

7cb078b

atlv24 merged commit d659a41 into atlv24:ray-tracing Jul 26, 2024
27 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge with trunk #3

Merge with trunk #3

Vecvec commented Jun 16, 2024

atlv24 commented Jul 26, 2024

Merge with trunk #3

Merge with trunk #3

Conversation

Vecvec commented Jun 16, 2024

atlv24 commented Jul 26, 2024