diff options
| author | Cinder Biscuits <cinder.roxley@phoenixviewer.com> | 2014-04-14 23:08:50 +0000 |
|---|---|---|
| committer | Cinder Biscuits <cinder.roxley@phoenixviewer.com> | 2014-04-14 23:08:50 +0000 |
| commit | 60795c508ee8baa5e21dee7dd990a5276cc02176 (patch) | |
| tree | 2136b58f73d7cab3c6fd2ab6d3b2a3bcca8063a1 | |
| parent | 7e966f28da79d2d24f93a2615c8807421300700c (diff) | |
OPEN-215: Replace deprecated call to kCGLRPTextureMemory with kCGLRPTextureMemoryMegabytes
| -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 b393a3796d..9155e59a1d 100644 --- a/indra/llwindow/llopenglview-objc.mm +++ b/indra/llwindow/llopenglview-objc.mm @@ -101,20 +101,20 @@ attributedStringInfo getSegments(NSAttributedString *str) - (unsigned long)getVramSize { CGLRendererInfoObj info = 0; - GLint vram_bytes = 0; + GLint vram_mbytes = 0; int num_renderers = 0; CGLError the_err = CGLQueryRendererInfo (CGDisplayIDToOpenGLDisplayMask(kCGDirectMainDisplay), &info, &num_renderers); if(0 == the_err) { - CGLDescribeRenderer (info, 0, kCGLRPTextureMemory, &vram_bytes); + CGLDescribeRenderer (info, 0, kCGLRPTextureMemoryMegabytes, &vram_mbytes); CGLDestroyRendererInfo (info); } else { - vram_bytes = (256 << 20); + vram_mbytes = 256; } - return (unsigned long)vram_bytes / 1048576; // We need this in megabytes. + return (unsigned long)vram_mbytes; } - (void)viewDidMoveToWindow |