summaryrefslogtreecommitdiff
path: root/indra/llrender/llgl.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-06-21 16:11:04 -0500
committerDave Parks <davep@lindenlab.com>2011-06-21 16:11:04 -0500
commit2ac1fe03e85b6b81076a4cfff86ee2ef5af178c4 (patch)
tree169d74b6e0fa3ea7811d87b753f513317d4c801b /indra/llrender/llgl.cpp
parentfe1f59b8b88bce9e293126ae42b98635c9455191 (diff)
SH-1838 Fix for black screen when enabling lighting and shadows on an ATI machine.
Diffstat (limited to 'indra/llrender/llgl.cpp')
-rw-r--r--indra/llrender/llgl.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index a3aed4dd8a..c224ab0e9b 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -568,6 +568,13 @@ bool LLGLManager::initGL()
glGetIntegerv(GL_MAX_SAMPLE_MASK_WORDS, &mMaxSampleMaskWords);
}
+#if LL_WINDOWS
+ if (mIsATI)
+ { //using multisample textures on ATI results in black screen for some reason
+ mHasTextureMultisample = FALSE;
+ }
+#endif
+
if (mHasFramebufferObject)
{
glGetIntegerv(GL_MAX_SAMPLES, &mMaxSamples);