Skip to content

FIX - Inspect floater VRAM estimate can overshoot by a lot #216

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

Open
trish-sl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

FIX - Inspect floater VRAM estimate can overshoot by a lot #216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions indra/newview/llfloaterinspect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,16 @@ void LLFloaterInspect::calculateTextureMemory(LLViewerTexture* texture, uuid_vec
U32 vram_memory = (texture->getFullHeight() * texture->getFullWidth() * 32 / 8);
U32 texture_memory = (texture->getFullHeight() * texture->getFullWidth() * texture->getComponents());

// Use actual GL memory instead of a fixed RGBA32 estimate if possible.
if (texture->hasGLTexture())
{
const S32 vram_bytes = texture->getTextureMemory().value();
if (vram_bytes > 0)
{
vram_memory = static_cast<U32>(vram_bytes);
}
}

if (std::find(mTextureList.begin(), mTextureList.end(), uuid) == mTextureList.end())
{
mTextureList.push_back(uuid);
Expand Down