bevy_settings: wasm clippy#24195
Merged
alice-i-cecile merged 1 commit intoMay 8, 2026
Merged
Conversation
mockersf
added
the
C-Code-Quality
Zeophlite
approved these changes
May 8, 2026
Zeophlite
added
D-Trivial
mnmaita
approved these changes
May 8, 2026
allocatedribble
added a commit
to allocatedribble/bevy
that referenced
this pull request
May 10, 2026
Brings in 25 upstream commits since 90a282a, including: - Resource hooks & immutable resources (bevyengine#24164) — `#[resource(immutable)]`, `add_resource_hook`, `mutate_resource[_safe]` reorganization - OpenType font variations (bevyengine#24088) — `FontVariations`, `font_variations.rs` example, integration through `bevy_text` and `bevy_ui` - Tileset grids in `ImageArrayLayout` (bevyengine#24132) — new `ImageArrayLayout::Tileset` variant supported by the image loader - Free camera controller local-Y controls (bevyengine#24161) and showcase wiring - Solari shader updates: gbuffer perceptual roughness, motion vector wiring in DLSS-RR resolve, GI alpha=0 outputs, PSR uses perceptual roughness - Stale directional light shadow map caching fix (bevyengine#24199) - All-style support for text input (bevyengine#24187), `Outline::Default`, ECS query contiguous-iterator API returning `Result`, lz4_flex 0.13 bump, and a raft of wasm/feature gating fixes (bevyengine#24188..bevyengine#24195) plus dependabot bumps Conflicts (Solari WGSL, both resolved): - `crates/bevy_solari/src/realtime/resolve_dlss_rr_textures.wgsl` Took upstream's `motion_vectors` import (now used by the `specular_motion_vectors` write upstream added) while preserving the fork's `dlss_rr_bias` binding, the `DLSS_RR_DIFFUSE/GLOSSY_SURFACE_BIAS` constants, and the `store_dlss_rr_background_guides` helper. The depth==0 branch keeps the fork's helper call (it writes the same diffuse/specular/normal defaults plus the bias texture, which the fork's bind group still expects). - `crates/bevy_solari/src/realtime/specular_gi.wgsl` Took upstream's three `textureStore` lines for the PSR mirror branch (alpha=0.0 in albedo writes, `material.perceptual_roughness` instead of `saturate(material.roughness)` for the normal_roughness `.w`). Re-added the `dlss_rr_bias` write at 0.85 to keep the fork's DLSS-RR bias texture initialized — removing it would leave bind group 2 binding 4 uninitialized after PSR. Validation: `cargo check --workspace --all-targets` clean. The only warnings are upstream `f32` fallback notices in `crates/bevy_feathers/src/controls/text_input.rs`, introduced by PR bevyengine#24187 and not caused by this merge.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Objective
cargo clippy --target wasm32-unknown-unknown -p bevy_settings --no-deps -- -D warningsclippy::needless_borrowSolution
Testing