Skip to content

Merge main into ray tracing#3

Closed
atlv24 wants to merge 821 commits intodaniel-keitel:ray-tracingfrom
atlv24:ray-tracing
Closed

Merge main into ray tracing#3
atlv24 wants to merge 821 commits intodaniel-keitel:ray-tracingfrom
atlv24:ray-tracing

Conversation

@atlv24
Copy link
Copy Markdown

@atlv24 atlv24 commented Apr 14, 2024

Merges main and fixes compile errors. Tests fail on vulkan validation now though

@atlv24 atlv24 changed the title Ray tracing Merge main into ray tracing Apr 14, 2024
teoxoy and others added 28 commits July 9, 2024 10:48
…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
Consolidate the explanation of buffer mapping in the documentation for
`Buffer`. Change the example code to actually compile, given that the
`map_async` callback needs to share access to the buffer with
`map_async`'s caller. Mapping isn't pretty, but covering that up in
the docs doesn't improve matters.

For `BufferSlice`, `BufferView`, and `BufferViewMut`, consolidate
extended explanations and background in the docs for types, rather
than scattering it around in the docs for associated functions.

For `Buffer::slice`, `BufferSlice::get_mapped_range`, and
`BufferSlice::get_mapped_range_mut`, update documentation to provide
necessary details, but defer to types' docs for background.
naga doesn't have a `serde` feature, instead having separate
`serialize` and `deserialize` features, so things that want to
modify the serde handling must check for either of those, not
for `serde` itself.
* Add missing changelog entry for `msl-out-if-target-apple`/`hlsl-out-if-target-windows` feature addition

* minor changelog reorganisation

* fix missing author attribution & pr link in changelog

* import patch release changelogs and remove redundant items

* move pipeline overridable constants from bugfixes to features
The current code works, but `serde` documents that the feature to
use is `derive` (which then happens to use the `serde_derive`
implicit feature).
This helps to prepare for the coming day when explicit features
will be required.
Wumpf and others added 27 commits August 14, 2024 17:34
…ffects from there leading to boxing of almost all hal resources
gfx_select macros are empty husks now that are waiting to be removed
…cing-updated

# Conflicts:
#	wgpu-core/src/binding_model.rs
#	wgpu-core/src/command/compute.rs
#	wgpu-core/src/command/mod.rs
#	wgpu-core/src/command/render.rs
#	wgpu-core/src/device/global.rs
#	wgpu-core/src/device/queue.rs
#	wgpu-core/src/device/resource.rs
#	wgpu-core/src/hub.rs
#	wgpu-core/src/track/mod.rs
#	wgpu/src/lib.rs
@atlv24 atlv24 deleted the branch daniel-keitel:ray-tracing June 29, 2025 21:45
@atlv24 atlv24 closed this Jun 29, 2025
@atlv24 atlv24 deleted the ray-tracing branch June 29, 2025 21:45
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.