diff options
| author | callum_linden <none@none> | 2014-10-17 15:39:13 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-10-17 15:39:13 -0700 |
| commit | 73224a952afbdbd37bab876bd5a8959a5ec3ee58 (patch) | |
| tree | 77fcc913ae7ce31daee53dd8f093e210ba3e7a5e /indra/llwindow | |
| parent | c2772bc13a9e3e2044706a0e41c7b5c0fe86e9ed (diff) | |
Update to build on Xcode 6.0: fix deprecated constant in OS X land
Diffstat (limited to 'indra/llwindow')
| -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 f7031341eb..141eab792a 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_bytes = 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, kCGLRPTextureMemory, &vram_bytes); + CGLDescribeRenderer (info, 0, kCGLRPTextureMemoryMegabytes, &vram_megabytes); CGLDestroyRendererInfo (info); } else { - vram_bytes = (256 << 20); + vram_megabytes = 256; } - return (unsigned long)vram_bytes / 1048576; // We need this in megabytes. + return (unsigned long)vram_megabytes; // return value is in megabytes. } - (void)viewDidMoveToWindow |