fix(ishdr): gate bloom for legacy weather mods#2297
Conversation
|
No actionable suggestions for changed features. |
📝 WalkthroughWalkthroughThe BLEND shader path now branches its bloom addition logic based on HDR mode. For HDR, it applies a soft-saturation mask using exponential decay; for SDR, it applies a hard-cutoff mask. Both paths multiply the resulting bloomMask by bloomColor before adding to the blended result. ChangesHDR-dependent bloom masking
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
There was a problem hiding this comment.
🧹 Nitpick comments (1)
package/Shaders/ISHDR.hlsl (1)
171-176: Consider adding an issue-closing keyword in the PR description (if this maps to a tracked bug).Using
Fixes #<id>/Closes #<id>will improve traceability and auto-close behavior after merge.As per coding guidelines "Suggest adding appropriate GitHub keywords: 'Fixes
#123' or 'Closes#123' for bug fixes".🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@package/Shaders/ISHDR.hlsl` around lines 171 - 176, The PR lacks an issue-closing keyword for traceability; update the pull request description to include a GitHub keyword like "Fixes #<id>" or "Closes #<id>" that references the tracked bug this change addresses (e.g., the HDR/SDR bloom behavior code around bloomMask, isHDR, Param.x, blendedColor and bloomColor in ISHDR.hlsl) so the issue is auto-closed on merge.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Nitpick comments:
In `@package/Shaders/ISHDR.hlsl`:
- Around line 171-176: The PR lacks an issue-closing keyword for traceability;
update the pull request description to include a GitHub keyword like "Fixes
#<id>" or "Closes #<id>" that references the tracked bug this change addresses
(e.g., the HDR/SDR bloom behavior code around bloomMask, isHDR, Param.x,
blendedColor and bloomColor in ISHDR.hlsl) so the issue is auto-closed on merge.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yaml
Review profile: CHILL
Plan: Pro Plus
Run ID: 86075eed-9b90-497b-afca-05db9bed5e29
📒 Files selected for processing (1)
package/Shaders/ISHDR.hlsl
Catches up with 4 commits from upstream/dev: * refactor(hlsl): use Game constants (community-shaders#2298) * fix: mesh external emittance in interiors (community-shaders#2294) -- adds Utils/ExternalEmittance, hooks LLF's BSEffectShader_SetupGeometry via ExternalEmittance::UpdatePermutation(Pass) * fix(grass-collision): avoid sorting actor smart pointers (community-shaders#2299) * fix(ishdr): gate bloom for legacy weather mods (community-shaders#2297) Conflicts resolved: * features/Inverse Square Lighting/Shaders/Features/InverseSquareLighting.ini Took upstream's 1-3-0 (their refactor; we hadn't bumped ISL). * features/Light Limit Fix/Shaders/Features/LightLimitFix.ini Kept our 3-1-0 -- supersedes upstream's 3-0-3 because our UI consolidation is the larger structural change. Upstream's external-emittance hook is folded in alongside. * src/Features/LightLimitFix.cpp Kept BOTH include sets: our Deferred.h plus upstream's Menu/ThemeManager.h and Utils/ExternalEmittance.h. The BSEffectShader_SetupGeometry hook gained ExternalEmittance::UpdatePermutation(Pass) cleanly via the auto-merger -- no manual reconciliation needed there. Build verified: ALL preset compiles cleanly post-merge.
Catches up with 4 commits from upstream/dev: * refactor(hlsl): use Game constants (#2298) * fix: mesh external emittance in interiors (#2294) -- adds Utils/ExternalEmittance, hooks LLF's BSEffectShader_SetupGeometry via ExternalEmittance::UpdatePermutation(Pass) * fix(grass-collision): avoid sorting actor smart pointers (#2299) * fix(ishdr): gate bloom for legacy weather mods (#2297) Conflicts resolved: * features/Inverse Square Lighting/Shaders/Features/InverseSquareLighting.ini Took upstream's 1-3-0 (their refactor; we hadn't bumped ISL). * features/Light Limit Fix/Shaders/Features/LightLimitFix.ini Kept our 3-1-0 -- supersedes upstream's 3-0-3 because our UI consolidation is the larger structural change. Upstream's external-emittance hook is folded in alongside. * src/Features/LightLimitFix.cpp Kept BOTH include sets: our Deferred.h plus upstream's Menu/ThemeManager.h and Utils/ExternalEmittance.h. The BSEffectShader_SetupGeometry hook gained ExternalEmittance::UpdatePermutation(Pass) cleanly via the auto-merger -- no manual reconciliation needed there. Build verified: ALL preset compiles cleanly post-merge.
Fixes old weather mods looking blown out in SDR. Merge when verified by users on discord.
Summary by CodeRabbit