livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NORSPEC-314 work-around mystery mac GeForce crash from new shader for nspec 295

meow-7.2.2
Graham Madarasz 2013-07-18 06:37:22 -07:00
parent b32f879a6d
commit 8712086a4b
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/lldrawpoolsimple.cpp
View File

@ -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);
}