From 69b405553ff550fab230ef7624e6dd487302452f Mon Sep 17 00:00:00 2001 From: Beq Date: Fri, 19 Jul 2024 16:31:49 +0100 Subject: [PATCH] Updated VRAM reporting logic on Linux Modified the condition for using NVXMemInfo in LLWindowSDL. Now, it will only use accurate feedback onNVidia if there's no override being used. --- indra/llwindow/llwindowsdl2.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llwindow/llwindowsdl2.cpp b/indra/llwindow/llwindowsdl2.cpp index 7c877c8ba7..8128d33619 100644 --- a/indra/llwindow/llwindowsdl2.cpp +++ b/indra/llwindow/llwindowsdl2.cpp @@ -2691,7 +2691,8 @@ U32 LLWindowSDL::getAvailableVRAMMegabytes() return gGLManager.mVRAM - (LLImageGL::getTextureBytesAllocated() * total_factor/mb); */ LL_PROFILE_ZONE_SCOPED; - if (gGLManager.mHasNVXMemInfo) + // Only use the accurate feedback if we are not using an override + if (gGLManager.mHasNVXMemInfo && gGLManager.mVRAM == gGLManager.mVRAMDetected) { S32 available_memory; glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &available_memory);