summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-11-01 12:47:06 -0500
committerDave Parks <davep@lindenlab.com>2011-11-01 12:47:06 -0500
commit108cdf58c2def80cf6c88e35c85b6da1c3709b76 (patch)
tree89d5ed03fa13bb43c50d034f7f164c5e553a8d60 /indra/newview
parent74fcb62b3dc0084c61cdf611b2b95ab3b03203bd (diff)
SH-2620 Force FXAA shader to off on OSX
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/pipeline.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 76ad7fd83e..85a7691ead 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -6405,6 +6405,10 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
bool multisample = RenderFSAASamples > 1;
+#if LL_DARWIN //force FXAA to off on OSX (SH-2620)
+ multisample = false;
+#endif
+
if (multisample)
{
//bake out texture2D with RGBL for FXAA shader