summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-04-22 11:50:19 -0500
committerDave Parks <davep@lindenlab.com>2011-04-22 11:50:19 -0500
commit764412f9b5e8d69950f9866a60299b1b458339c6 (patch)
tree7e9d634faddd40edf8ed715e7b479d1336ed7697 /indra/newview/llfeaturemanager.cpp
parentb15dca22637b0b2c1947b758a93f51163fb48cf1 (diff)
parent0349d1f29197ca00c9eb7278d97bd56ea4d2050a (diff)
merge
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r--indra/newview/llfeaturemanager.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 4e16cc4217..9f0b34becc 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -729,6 +729,10 @@ void LLFeatureManager::applyBaseMasks()
{
maskFeatures("ATI");
}
+ if (gGLManager.mHasATIMemInfo && gGLManager.mVRAM < 256)
+ {
+ maskFeatures("ATIVramLT256");
+ }
if (gGLManager.mATIOldDriver)
{
maskFeatures("ATIOldDriver");
@@ -745,6 +749,10 @@ void LLFeatureManager::applyBaseMasks()
{
maskFeatures("OpenGLPre15");
}
+ if (gGLManager.mGLVersion < 3.f)
+ {
+ maskFeatures("OpenGLPre30");
+ }
// now mask by gpu string
// Replaces ' ' with '_' in mGPUString to deal with inability for parser to handle spaces