summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-07-18 06:44:28 -0700
committerGraham Linden <graham@lindenlab.com>2013-07-18 06:44:28 -0700
commit6c186b0c4137220697999c9ffc5e8a23058f5a4d (patch)
tree311adf3181d51aba7527b3d1c8f1344d559c962f /indra
parent0160491f888917d830ca3d827cc1f28f07363fed (diff)
parent8712086a4bcf1f0f7527a916baafc9e65667e4e8 (diff)
Merge vwr-dev-mat
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/lldrawpoolsimple.cpp11
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);
}