diff options
| author | prep <prep@lindenlab.com> | 2011-03-10 13:04:36 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-03-10 13:04:36 -0500 |
| commit | fb00d280403b2befd645b8a80c3d9a3183e4c02c (patch) | |
| tree | cb5b9cdc5c87b913000866a3dbb24d2ddaf46f33 /indra/newview | |
| parent | 55dbd0c4f3c1cc3598d3d8428dea4a2645b211c4 (diff) | |
| parent | e3e12bc3df13af25f921d47852edff3254364282 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 7 |
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; |