diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-07-23 13:48:57 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-07-23 13:48:57 -0700 |
| commit | b411179bd0cffdf02b3109b72c7b79e4f7a5a2e3 (patch) | |
| tree | 5c79c1f185229b2187fc77a93cfbedd2e10a46c9 | |
| parent | 18c7ef32762a6c23fdb1dfe875669fd9ebab0bfe (diff) | |
NORSPEC-314 make work-around apply to all Macs for now
| -rwxr-xr-x | indra/newview/lldrawpoolsimple.cpp | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/indra/newview/lldrawpoolsimple.cpp b/indra/newview/lldrawpoolsimple.cpp index 06e8a3537a..aee9d19d19 100755 --- a/indra/newview/lldrawpoolsimple.cpp +++ b/indra/newview/lldrawpoolsimple.cpp @@ -657,18 +657,13 @@ void LLDrawPoolFullbrightAlphaMask::beginPostDeferredPass(S32 pass) else { +// Work-around until we can figure out why the right shader causes +// the GeForce driver to go tango uniform on OS X 10.6.8 only +// #if GE_FORCE_WORKAROUND - // Work-around until we can figure out why the right shader causes - // the GeForce driver to go tango uniform on OS X 10.6.8 only - // - if (gGLManager.mIsMobileGF) - { - gObjectFullbrightAlphaMaskProgram.bind(); - gObjectFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f); - return; - } -#endif - + gObjectFullbrightAlphaMaskProgram.bind(); + gObjectFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f); +#else if (LLPipeline::sUnderWaterRender) { gDeferredFullbrightAlphaMaskWaterProgram.bind(); @@ -679,7 +674,9 @@ void LLDrawPoolFullbrightAlphaMask::beginPostDeferredPass(S32 pass) gDeferredFullbrightAlphaMaskProgram.bind(); gDeferredFullbrightAlphaMaskProgram.uniform1f(LLShaderMgr::TEXTURE_GAMMA, 2.2f); } +#endif } + } void LLDrawPoolFullbrightAlphaMask::renderPostDeferred(S32 pass) @@ -699,16 +696,12 @@ void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass) else { -#if GE_FORCE_WORKAROUND - // Work-around until we can figure out why the right shader causes - // the GeForce driver to go tango uniform on OS X 10.6.8 only - // - if (gGLManager.mIsMobileGF) - { - gObjectFullbrightAlphaMaskProgram.unbind(); - } - else -#endif +// Work-around until we can figure out why the right shader causes +// the GeForce driver to go tango uniform on OS X 10.6.8 only +// +#if GE_FORCE_WORKAROUND + gObjectFullbrightAlphaMaskProgram.unbind(); +#else if (LLPipeline::sUnderWaterRender) { gDeferredFullbrightAlphaMaskWaterProgram.unbind(); @@ -717,6 +710,7 @@ void LLDrawPoolFullbrightAlphaMask::endPostDeferredPass(S32 pass) { gDeferredFullbrightAlphaMaskProgram.unbind(); } +#endif } LLRenderPass::endRenderPass(pass); |