Fix double free in FSR2 destructor #95682
Merged
+0
−3
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
Before this change, using FSR2 resulted in the following error when the effect was destroyed: ERROR: Attempted to free invalid ID: 662734928609453 at: _free_internal (servers/rendering/rendering_device.cpp:4957) This happened because ACCUMULATE and ACCUMULATE_SHARPEN passes shared the same shader_version object but had different pipeline IDs. When version_free was called for ACCUMULATE pass, it destroyed pipelines created from that version, including the pipeline for the ACCUMULATE_SHARPEN pass. Using a unique version could work around this problem, but it's easier to rely on version_free destroying the created pipelines through the dependency mechanism.
clayjohn
approved these changes
Aug 18, 2024
akien-mga
added
the
cherrypick:4.3
|
Thanks! |
|
Cherry-picked for 4.3.1. |
akien-mga
removed
the
cherrypick:4.3
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.
Before this change, using FSR2 resulted in the following error when the effect was destroyed:
This happened because ACCUMULATE and ACCUMULATE_SHARPEN passes shared the same shader_version object but had different pipeline IDs. When version_free was called for ACCUMULATE pass, it destroyed pipelines created from that version, including the pipeline for the ACCUMULATE_SHARPEN pass.
Using a unique version could work around this problem, but it's easier to rely on version_free destroying the created pipelines through the dependency mechanism.
I've verified that FSR2 works correctly after this change (on TPS demo) and that the pipelines are all destroyed; during the call of
version_freefor accumulate pass, both the pipelines created for accumulate and accumulate_sharpen passes are destroyed; the call in accumulate_sharpen becomes a no-op.