From eb809e373d2f12fd1a282401eb2ac4fbaf209f85 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 5 Oct 2011 01:03:42 -0500
Subject: SH-2481 Potential fix for viewer detecting incorrect amount of vram
 available when using certain video cards.

---
 indra/llrender/llgl.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'indra')

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 8ad75384f2..c0d15fe6f3 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -630,6 +630,8 @@ bool LLGLManager::initGL()
 	initExtensions();
 	stop_glerror();
 
+	S32 old_vram = mVRAM;
+
 	if (mHasATIMemInfo)
 	{ //ask the gl how much vram is free at startup and attempt to use no more than half of that
 		S32 meminfo[4];
@@ -644,6 +646,11 @@ bool LLGLManager::initGL()
 		mVRAM = dedicated_memory/1024;
 	}
 
+	if (mVRAM < 256)
+	{ //something likely went wrong using the above extensions, fall back to old method
+		mVRAM = old_vram;
+	}
+
 	stop_glerror();
 
 	stop_glerror();
-- 
cgit v1.2.3