diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 13:36:35 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-04-28 13:36:35 +0300 |
| commit | bb87365c37047a35bf524a98d5a48cdb2d56948e (patch) | |
| tree | 5b44b30944f794c2e2f78a0990cf56f81d27fa78 /indra/llwindow/llopenglview-objc.mm | |
| parent | a89f3f29a0af37c7f3e78e38acb78f78e99dae78 (diff) | |
| parent | fde0868231a25b8c9ce03a86cb53f1738d35688d (diff) | |
Merge viewer-release, become version 3.7.29
Diffstat (limited to 'indra/llwindow/llopenglview-objc.mm')
| -rw-r--r-- | indra/llwindow/llopenglview-objc.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llwindow/llopenglview-objc.mm b/indra/llwindow/llopenglview-objc.mm index 9e7093782e..1c9160a42d 100644 --- a/indra/llwindow/llopenglview-objc.mm +++ b/indra/llwindow/llopenglview-objc.mm @@ -104,20 +104,20 @@ attributedStringInfo getSegments(NSAttributedString *str) - (unsigned long)getVramSize { CGLRendererInfoObj info = 0; - GLint vram_mbytes = 0; + GLint vram_megabytes = 0; int num_renderers = 0; CGLError the_err = CGLQueryRendererInfo (CGDisplayIDToOpenGLDisplayMask(kCGDirectMainDisplay), &info, &num_renderers); if(0 == the_err) { - CGLDescribeRenderer (info, 0, kCGLRPTextureMemoryMegabytes, &vram_mbytes); + CGLDescribeRenderer (info, 0, kCGLRPTextureMemoryMegabytes, &vram_megabytes); CGLDestroyRendererInfo (info); } else { - vram_mbytes = 256; + vram_megabytes = 256; } - return (unsigned long)vram_mbytes; + return (unsigned long)vram_megabytes; // return value is in megabytes. } - (void)viewDidMoveToWindow |