Ensure instance uniforms are freed by updating dirty items before freeing #102503
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
stuartcarnie
approved these changes
Feb 6, 2025
akien-mga
added a commit
to akien-mga/godot
that referenced
this pull request
Feb 7, 2025
…free Ensure instance uniforms are freed by updating dirty items before freeing
|
Thanks! |
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.
Fixes: #101663
update_dirty_items()goes through the list of canvas items that have instance uniforms that have changed and updates/allocates them as needed. By default it always allocates space if the canvas item hasn't had instance uniforms allocated. Therefore, immediately after freeing the instance uniform we were re-allocating it and then freeing the canvas item and leaking that memory.This PR fixes the issue by ensuring all the dirty items are updated before freeing.
Targeting 4.4 since this is a serious problem with the new 2D instance uniform system.