Fix render states merging when additionalState is not set #2208
Conversation
This file contains 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
riccardobl
added
the
bug
riccardobl
force-pushed
the
fixupdaterenderstate
branch
from
1caefd1
to
22618ff
Compare
|
Note: it seems this issue was introduced by PR #2091. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
While testing some pbr code, i've noticed that something was off with lighting, after some convoluted debugging i've found that pr 5975b3f introduced a bug.
The tl;dr is that copyMergedTo changes the passed state when additionalState is set, but returns
thiswhen it isn't, causing mergedRenderState to not be updated at all.This PR restores the original behavior of passing the returned state to applyRenderState instead of mergedRenderState.