diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-30 19:37:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-30 19:37:56 -0400 |
| commit | 662a92784328f31b680f4f049350dd0f6cacf4c7 (patch) | |
| tree | 81c6c9634d919941e683f5d2e3ca0dd8c0c655cd /indra/llrender/llgl.cpp | |
| parent | 6be68618c4b32082228d9c34083542017b84482f (diff) | |
| parent | 7a85df942916b8387fd822a9e22cb0857c258be5 (diff) | |
merge changes for shining branch
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); |