summaryrefslogtreecommitdiff
path: root/indra/llrender/llgl.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-07-26 15:41:49 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-07-26 15:41:49 -0400
commited701685f6d07da47a3a796bd79dfc4ae1860fcc (patch)
tree244612881e0787e5f6f7be6a319aaad67fb09059 /indra/llrender/llgl.cpp
parentc567f0dcdd1b31cc94e9065218a88d48cdaf2278 (diff)
parentc118ec209907618c77613990fe2359d4f92802e6 (diff)
merged .hgtags
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);