diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-07-18 06:37:22 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-07-18 06:37:22 -0700 |
commit | 8712086a4bcf1f0f7527a916baafc9e65667e4e8 (patch) | |
tree | abe5bda91431ffeb36889b778e4649b08924c390 /indra | |
parent | b32f879a6d60fcb9a34435b2b7e9a4509fd32cc6 (diff) |
NORSPEC-314 work-around mystery mac GeForce crash from new shader for nspec 295
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/newview/lldrawpoolsimple.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp index e219769a0c..87fbeaf2c0 100755 --- a/indra/newview/lldrawpoolsimple.cpp +++ b/indra/newview/lldrawpoolsimple.cpp @@ -633,8 +633,15 @@ void LLDrawPoolFullbrightAlphaMask::beginPostDeferredPass(S32 pass) } else { +#if LL_DARWIN + // the OS X 10.6.8 GeForce driver is a real POS + // this is a work-around for NORSPEC-314 + gObjectFullbrightAlphaMaskProgram.bind(); + gObjectFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f); +#else gDeferredFullbrightAlphaMaskProgram.bind(); gDeferredFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f); +#endif } } @@ -654,7 +661,11 @@ void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass) } else { +#if LL_DARWIN + gObjectFullbrightAlphaMaskProgram.unbind(); +#else gDeferredFullbrightAlphaMaskProgram.unbind(); +#endif } LLRenderPass::endRenderPass(pass); } |