Skip to content

Fix deferred lighting out of sync shader defs - #25254

Merged
mockersf merged 3 commits into
bevyengine:mainfrom
JMS55:fix-deferred-contact-shadows
Aug 2, 2026
Merged

Fix deferred lighting out of sync shader defs#25254
mockersf merged 3 commits into
bevyengine:mainfrom
JMS55:fix-deferred-contact-shadows

Conversation

@JMS55

@JMS55 JMS55 commented Aug 1, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Fixes #25090
Fixes #25084

@JMS55 JMS55 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 Aug 1, 2026
@JMS55 JMS55 added this to the 0.19.1 milestone Aug 1, 2026
@github-project-automation github-project-automation Bot moved this to Needs SME Triage in Rendering Aug 1, 2026
@beicause

beicause commented Aug 2, 2026

Copy link
Copy Markdown
Member

Can you also fix #25084 since we are at it?

@JMS55 JMS55 changed the title Fix deferred contact shadows Fix deferred contact shadows and area lights Aug 2, 2026
@JMS55
JMS55 requested review from beicause and kfc35 August 2, 2026 01:20
beicause
beicause reviewed Aug 2, 2026
View reviewed changes
Comment thread crates/bevy_pbr/src/deferred/mod.rs Outdated
@JMS55 JMS55 changed the title Fix deferred contact shadows and area lights Fix deferred lighting missing shader defs Aug 2, 2026
@JMS55 JMS55 changed the title Fix deferred lighting missing shader defs Fix deferred lighting out of sync shader defs and view layout Aug 2, 2026
@JMS55 JMS55 changed the title Fix deferred lighting out of sync shader defs and view layout Fix deferred lighting out of sync shader defs Aug 2, 2026
@JMS55
JMS55 requested a review from beicause August 2, 2026 03:28
beicause

This comment was marked as resolved.

Sign in to view

beicause
beicause approved these changes Aug 2, 2026
View reviewed changes

@beicause beicause left a comment •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving.

Sorry that #25254 (review) was a mistake in my testing (when switching to forward mode, the depth prepass was removed, but I didn't remove ContactShadows which needs the depth prepass)

@beicause beicause 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 Aug 2, 2026
@mockersf
mockersf added this pull request to the merge queue Aug 2, 2026
Merged via the queue into bevyengine:main with commit 4a0feef Aug 2, 2026
40 checks passed
@github-project-automation github-project-automation Bot moved this from Needs SME Triage to Done in Rendering Aug 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mockersf mockersf mockersf approved these changes
+2 more reviewers
@kfc35 kfc35 kfc35 approved these changes
@beicause beicause beicause approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

A-Rendering Drawing game state to the screen C-Bug An unexpected or incorrect behavior S-Ready-For-Final-Review This PR has been approved by the community. It's ready for a maintainer to consider merging it

Projects

Rendering
Status: Done

Milestone

0.19.1

4 participants

@JMS55 @beicause @kfc35 @mockersf