Skip to content

Run prepass_build_indirect_parameters if there is any prepass#24113

Merged
alice-i-cecile merged 1 commit into
bevyengine:mainfrom
beicause:fix-prepass-without-depth-prepass
May 5, 2026
Merged

Run prepass_build_indirect_parameters if there is any prepass#24113
alice-i-cecile merged 1 commit into
bevyengine:mainfrom
beicause:fix-prepass-without-depth-prepass

Conversation

@beicause

@beicause beicause commented May 4, 2026

Copy link
Copy Markdown
Member

Objective

Fixes #24097

Indirect parameters are not built in early prepass if depth prepass and shadow map are not enabled:

屏幕截图_20260504_123430

Solution

Run prepass_build_indirect_parameters if there is any prepass, not only depth prepass.

Testing

motion_blur example without shadow map is fixed:

屏幕截图_20260504_140302

@kfc35 kfc35 added C-Bug An unexpected or incorrect behavior A-Rendering Drawing game state to the screen S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels May 4, 2026
@github-project-automation github-project-automation Bot moved this to Needs SME Triage in Rendering May 4, 2026
@kfc35 kfc35 added this to the 0.19 milestone May 4, 2026
@alice-i-cecile alice-i-cecile requested review from JMS55 and kfc35 May 4, 2026 14:53
@kfc35 kfc35 added the D-Straightforward Simple bug fixes and API improvements, docs, test and examples label May 4, 2026
@cart cart closed this May 5, 2026
@github-project-automation github-project-automation Bot moved this from Needs SME Triage to Done in Rendering May 5, 2026
@cart cart reopened this May 5, 2026
@github-project-automation github-project-automation Bot moved this from Done to Needs SME Triage in Rendering May 5, 2026
@alice-i-cecile

Copy link
Copy Markdown
Member

Broken by the force push noted in #24130; you'll need to clean up the Git history per @cart's message.

@beicause beicause force-pushed the fix-prepass-without-depth-prepass branch from 8f18582 to c43594c Compare May 5, 2026 02:30
@JMS55 JMS55 added S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it and removed S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels May 5, 2026
@alice-i-cecile alice-i-cecile added this pull request to the merge queue May 5, 2026
Merged via the queue into bevyengine:main with commit 9bd7e1f May 5, 2026
40 checks passed
@github-project-automation github-project-automation Bot moved this from Needs SME Triage to Done in Rendering May 5, 2026
allocatedribble added a commit to allocatedribble/bevy that referenced this pull request May 5, 2026
Cherry-pick isolated upstream runtime and correctness fixes from bevyengine/bevy after upstream/main was force-updated away from the previously merged history.

Included upstream PRs:

- bevyengine#24077: store derived resources in sparse sets and add ECS resource benchmarks

- bevyengine#24113: run prepass indirect parameter building for any active prepass

- bevyengine#24135: skip UI clip tests when overflow is visible and reject non-invertible transforms

Skipped the rewritten full upstream merge because it overlaps local dirty render diagnostics work and would drop fork-local files from the forced-update range.

Validation: cargo fmt --check -p benches -p bevy_ecs_macros -p bevy_pbr -p bevy_ui; cargo check -p bevy_ecs_macros -p bevy_pbr -p bevy_ui
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-Rendering Drawing game state to the screen C-Bug An unexpected or incorrect behavior D-Straightforward Simple bug fixes and API improvements, docs, test and examples S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

Motion blur example breaks if shadows are disabled

5 participants