diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-05-19 17:28:23 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-05-19 17:28:23 -0700 |
commit | 19a06478d9863c451450b7c9e2f931ba587a3cec (patch) | |
tree | c7a700998ebd071b447ae1e50fb08be6f1eaf004 /indra/newview/llfeaturemanager.cpp | |
parent | a704394bb50012e3e8d3be358d286188afccbdf2 (diff) |
SH-1618 FIX -- Lighting and shadows crash ATI macs
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
the use of glEnable/glDisable on textures above the texture unit count
and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.
Reviewed by davep
Diffstat (limited to 'indra/newview/llfeaturemanager.cpp')
-rw-r--r-- | indra/newview/llfeaturemanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp index 524d2d74ef..b7aabe2aeb 100644 --- a/indra/newview/llfeaturemanager.cpp +++ b/indra/newview/llfeaturemanager.cpp @@ -753,7 +753,7 @@ void LLFeatureManager::applyBaseMasks() { maskFeatures("OpenGLPre30"); } - if (gGLManager.mNumTextureUnits <= 8) + if (gGLManager.mNumTextureImageUnits <= 8) { maskFeatures("TexUnit8orLess"); } |