summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-03-10 11:46:16 -0600
committerDave Parks <davep@lindenlab.com>2011-03-10 11:46:16 -0600
commit666f06eacecdcde2b5562b20b5231fdf1172b7b2 (patch)
tree269d322f5c234af1f0d34f011f724f07cdc954e5 /indra/newview
parentca610bfc82e9f150877efa7e8c4e972d47bce7d4 (diff)
SH-874 Followup -- use GL_NVX_gpu_memory_info for NVIDIA chips to detect actual installed and available VRAM.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerwindow.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 093e94add0..f665f39e9c 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -481,6 +481,13 @@ public:
ypos += y_inc;
}
}
+ else if (gGLManager.mHasNVXMemInfo)
+ {
+ S32 free_memory;
+ glGetIntegerv(GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX, &free_memory);
+ addText(xpos, ypos, llformat("%.2f MB Video Memory Free", free_memory/1024.f));
+ ypos += y_inc;
+ }
addText(xpos, ypos, llformat("%d MB Vertex Data", LLVertexBuffer::sAllocatedBytes/(1024*1024)));
ypos += y_inc;