Flush all resource caches on exit #2529
Merged
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
This makes sure textures and shaders are freed before VP2 shuts down.
| // If the textures would have been requested to reload in `ApplyPendingUpdates()`, | ||
| // we could still reuse the loaded one from cache, otherwise the idle task can | ||
| // safely release the texture. | ||
| std::unordered_set<HdVP2TextureInfoSharedPtr> pendingRemovalTextures; |
There was a problem hiding this comment.
Moved from the destructor so it can be accessed by OnMayaExit.
seando-adsk
previously approved these changes
Aug 5, 2022
williamkrick
suggested changes
Aug 5, 2022
| if (!_IsDisabledAsyncTextureLoading() && !_localTextureMap.empty()) { | ||
| std::mutex removalTaskMutex; |
There was a problem hiding this comment.
I thought that this mutex needs to be static so that all HdVP2Material will share the same mutex? With this version of the code the lock_guard does nothing and we could have unsafe parallel modification of pendingRemovalTextures.
Can we go back to the original changes and see if we can figure out the workflow that requires the lock?
There was a problem hiding this comment.
Agreed. The mutex and the structure it protects should ideally be kept together.
williamkrick
approved these changes
Aug 5, 2022
JGamache-autodesk
added
the
ready-for-merge
seando-adsk
approved these changes
Aug 8, 2022
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.
This makes sure textures and shaders are freed before VP2 shuts down.