diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-30 14:00:49 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-30 14:00:49 -0500 |
| commit | 7a85df942916b8387fd822a9e22cb0857c258be5 (patch) | |
| tree | 114a0bfd34dd13206f7f3a5ba54e1ec6246ea43a /indra/llrender/llgl.cpp | |
| parent | f07173a9689237bf2d8218600c15d6bf4d047cdc (diff) | |
| parent | 5e20cee4b474c20f1a43b46658918be9e05820b0 (diff) | |
merge
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 7 |
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); |