summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-11-15 17:32:09 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-11-15 17:32:09 -0800
commitd71736f3d92f1a276d4aafcbf70c6a8597457220 (patch)
treeaf370dfe51be24102a8d686850db76d9b3c3b5e7 /indra/newview/pipeline.cpp
parentad9e08b8a1c3ba34c2bb0ccaffe2e968da7b8c9a (diff)
SH-1865 PROGRESS -- Disable the anti-aliasing control on hardware our code doesn't support for anti-aliasing
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index c9e1b44b3f..230bf0e9fd 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1165,7 +1165,9 @@ BOOL LLPipeline::canUseWindLightShadersOnObjects() const
BOOL LLPipeline::canUseAntiAliasing() const
{
- return TRUE;
+ // We can use anti-aliasing if the GL manager can support some multisampling
+ BOOL can_fsaa = (gGLManager.getNumFBOFSAASamples(2) > 1);
+ return can_fsaa;
}
void LLPipeline::unloadShaders()