diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-02-13 15:41:21 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-02-13 15:41:21 -0600 |
| commit | 64c89ee2c51c539d38d4d55807b18172d6606514 (patch) | |
| tree | 3af32ee524d98111411752f4b1096599b20ea65a /indra/llrender/llgl.cpp | |
| parent | 001e32074d4fbc5d115c9a2fa1cb5de4b5932731 (diff) | |
SH-2908 Fix for mac build
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index e855dda57d..197bc2b422 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -561,6 +561,15 @@ bool LLGLManager::initGL() if (mGLVersion >= 2.f) { parse_glsl_version(mGLSLVersionMajor, mGLSLVersionMinor); + +#if LL_DARWIN + //never use GLSL greater than 1.20 on OSX + if (mGLSLVersionMajor > 1 || mGLSLVersionMinor >= 30) + { + mGLSLVersionMajor = 1; + mGLSLVersionMinor = 20; + } +#endif } // Trailing space necessary to keep "nVidia Corpor_ati_on" cards |