#5356 Fix fast texture cache's mutex stall #2#5412
Merged
akleshchev merged 1 commit intodevelopfrom Feb 15, 2026
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to reduce main-thread stalls in the fast texture cache path by prelocking cache-related mutexes so the main thread doesn’t repeatedly contend on the same locks multiple times per frame.
Changes:
- Prelock texture cache fast-cache and header ID map mutexes while draining
mFastCacheListon the main thread. - Expose
LLTextureCachemutex accessors to support external prelocking. - Add additional profiling zones in
LLMeshRepoThread::notifyLoadedMeshes()and clarify comments around fast-cache image construction.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| indra/newview/llviewertexturelist.cpp | Prelocks texture cache mutexes while processing mFastCacheList to reduce per-frame lock contention. |
| indra/newview/lltexturecache.h | Adds public accessors for internal mutexes and documents a lock-ordering constraint. |
| indra/newview/lltexturecache.cpp | Comment-only clarifications around fast-cache open lifetime and LLImageRaw ownership. |
| indra/newview/llmeshrepository.cpp | Adds named profiling zones around mesh notification processing blocks. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
e94a18b to
a7e42a9
Compare
maxim-productengine
approved these changes
Feb 12, 2026
marchcat
approved these changes
Feb 12, 2026
a7e42a9 to
7955b5f
Compare
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
First attempt didn't work well enough, prelocking mutex to make sure main thread gets priority and does not wait on the same mutex multiple times per frame.