Fix a double free of imagecache and add a replace mode for add_file() #2021
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
Now that we allow providing an external ImageCache to the texturesys, destroy handles its destroying and it shouldn't be done in the destructor.
Instead of assuming the present file is equivalent, nuke it and reset it with the new parameters. This fixes a problem adding files after somebody has asked for a handle. Also allow non mip-mapped files when coming from user buffers.
|
LGTM, thanks for the fixes. Merging. |
|
Later realized that this fixes #1632. |
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.
It is split in two commits, see the log. First one fixes a double free bug when the imagecache is provided to the texture system. The second is an option to make add_file() replace any existing entries. Useful for providing user buffers as textures that have already been queried (for instance to get a handle).