diff options
| author | Tofu Buzzard <no-email> | 2011-03-10 09:48:50 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-03-10 09:48:50 -0800 |
| commit | ce4fe510b7345eac536f5bc68d8e113f7eb9e26d (patch) | |
| tree | 23705ca3e1425ec59db39cfcc9b3446bff035c6c /indra/newview/llviewerwindow.cpp | |
| parent | 3dfd3292bfcc39e5545c562b2454e07a939c0322 (diff) | |
| parent | 1aa6b7c770ed8bdbcd0c854cd8008f2f9538acae (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -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; |