diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-10-02 14:19:16 -0500 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-10-02 14:19:16 -0500 |
| commit | 942df58666407b405ed4f82e05dea19dcc1a9f18 (patch) | |
| tree | a18ddf43684f9a7099ee4ed9c58ca16bd59d78ec /indra/newview/llviewertexture.cpp | |
| parent | bc4e90ea5e462662f90c860d69aaa53b88f189c5 (diff) | |
| parent | 153bd41bebae9f41e7c5e88dc54526eee152f6cf (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 9fc092d4b9..9336d99555 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -534,9 +534,12 @@ void LLViewerTexture::updateClass() static LLCachedControl<U32> max_vram_budget(gSavedSettings, "RenderMaxVRAMBudget", 0); + F64 texture_bytes_alloc = LLImageGL::getTextureBytesAllocated() / 1024.0 / 512.0; + F64 vertex_bytes_alloc = LLVertexBuffer::getBytesAllocated() / 1024.0 / 512.0; + // get an estimate of how much video memory we're using // NOTE: our metrics miss about half the vram we use, so this biases high but turns out to typically be within 5% of the real number - F32 used = (LLImageGL::getTextureBytesAllocated() + LLVertexBuffer::getBytesAllocated()) / 1024 / 512; + F32 used = (F32)ll_round(texture_bytes_alloc + vertex_bytes_alloc); F32 budget = max_vram_budget == 0 ? gGLManager.mVRAM : max_vram_budget; |