diff options
author | Oz Linden <oz@lindenlab.com> | 2013-04-09 17:09:52 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-04-09 17:09:52 -0400 |
commit | 8f84d75ae42f4bb6f3305c64e95bc4a070b774a6 (patch) | |
tree | ae3696ae60547d60516f0847c59a1bbaad73b5e9 /indra/llrender/llgl.cpp | |
parent | 0229b65a4d40287454bd690a414b6ce8f63856ea (diff) | |
parent | 991a3cf40eb22559f89808a87fdeda1d44eaaf8f (diff) |
merge fixes from graham
Diffstat (limited to 'indra/llrender/llgl.cpp')
-rw-r--r-- | indra/llrender/llgl.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 9967c23ce8..5429489075 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -445,7 +445,9 @@ LLGLManager::LLGLManager() : mIsGFFX(FALSE), mATIOffsetVerticalLines(FALSE), mATIOldDriver(FALSE), - +#if LL_DARWIN + mIsMobileGF(FALSE), +#endif mHasRequirements(TRUE), mHasSeparateSpecularColor(FALSE), @@ -637,6 +639,13 @@ bool LLGLManager::initGL() { mIsGF3 = TRUE; } +#if LL_DARWIN + else if ((mGLRenderer.find("9400M") != std::string::npos) + || (mGLRenderer.find("9600M") != std::string::npos)) + { + mIsMobileGF = TRUE; + } +#endif } else if (mGLVendor.find("INTEL") != std::string::npos |