diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
| commit | d3e954cfaca067adf60f2e3c161028c6549263e4 (patch) | |
| tree | 54826d4b8ff8fa7683770876bb654c3afdaaf076 /indra/llrender/llgl.cpp | |
| parent | 79836e32d575248642cfd6af837548aac054988f (diff) | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
Merge 3.6.6 Materials RC and update Intel HD gpu_table entries to expect GL 4.2 to nag resis to get the fixed Intel driver
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rwxr-xr-x | indra/llrender/llgl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index c3005f1722..a157cd94c4 100755 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -647,7 +647,8 @@ bool LLGLManager::initGL() } #if LL_DARWIN else if ((mGLRenderer.find("9400M") != std::string::npos) - || (mGLRenderer.find("9600M") != std::string::npos)) + || (mGLRenderer.find("9600M") != std::string::npos) + || (mGLRenderer.find("9800M") != std::string::npos)) { mIsMobileGF = TRUE; } @@ -1155,7 +1156,7 @@ void LLGLManager::initExtensions() glGetIntegerv(GL_MAX_ELEMENTS_VERTICES, (GLint*) &mGLMaxVertexRange); glGetIntegerv(GL_MAX_ELEMENTS_INDICES, (GLint*) &mGLMaxIndexRange); glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint*) &mGLMaxTextureSize); - + #if (LL_WINDOWS || LL_LINUX || LL_SOLARIS) && !LL_MESA_HEADLESS LL_DEBUGS("RenderInit") << "GL Probe: Getting symbols" << LL_ENDL; if (mHasVertexBufferObject) |