Skip to content

updateImageDecodePriority - Avoid Long Face Loop #4019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 5, 2025
Merged

updateImageDecodePriority - Avoid Long Face Loop #4019

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85bb422
updateImageDecodePriority - Avoid Long Face Loop
TommyTheTerrible May 4, 2025
cc8f4f8
updateImageDecodePriority - Face Loop Increment Swap
TommyTheTerrible May 4, 2025
5024843
updateImageDecodePriority - Suggested Cleanup
TommyTheTerrible May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions indra/newview/llviewertexturelist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,7 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
bool on_screen = false;

U32 face_count = 0;
U32 max_faces_to_check = 1024;

// get adjusted bias based on image resolution
LLImageGL* img = imagep->getGLTexture();
Expand All @@ -923,13 +924,15 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE;
for (U32 i = 0; i < LLRender::NUM_TEXTURE_CHANNELS; ++i)
{
for (S32 fi = 0; fi < imagep->getNumFaces(i); ++fi)
face_count += imagep->getNumFaces(i);
S32 faces_to_check = (face_count > max_faces_to_check) ? 0 : imagep->getNumFaces(i);

for (S32 fi = 0; fi < faces_to_check; ++fi)
{
LLFace* face = (*(imagep->getFaceList(i)))[fi];

if (face && face->getViewerObject())
{
++face_count;
F32 radius;
F32 cos_angle_to_view_dir;

Expand Down Expand Up @@ -992,11 +995,10 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
}
}

if (face_count > 1024)
if (face_count > max_faces_to_check)
{ // this texture is used in so many places we should just boost it and not bother checking its vsize
// this is especially important because the above is not time sliced and can hit multiple ms for a single texture
imagep->setBoostLevel(LLViewerFetchedTexture::BOOST_HIGH);
// Do we ever remove it? This also sets texture nodelete!
max_vsize = MAX_IMAGE_AREA;
}

if (imagep->getType() == LLViewerTexture::LOD_TEXTURE && imagep->getBoostLevel() == LLViewerTexture::BOOST_NONE)
Expand Down
Loading