diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-10-25 16:57:32 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-10-25 16:57:32 -0700 |
| commit | 86da2f74139438dcc2c10702d4cca63313a34a90 (patch) | |
| tree | f81641e3db923ae7e9b6fbbf683334197fadf284 /indra/llrender/llgl.cpp | |
| parent | 0cdb792d904198131187d6ead102f951b2894bd0 (diff) | |
| parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) | |
Merge branch 'master' into DRTVWR-489-emoji
Diffstat (limited to 'indra/llrender/llgl.cpp')
| -rw-r--r-- | indra/llrender/llgl.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 2b7ce155f6..193cfa64b8 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -743,6 +743,14 @@ bool LLGLManager::initGL() LL_WARNS("RenderInit") << "GL Drivers do not support GL_ARB_multitexture" << LL_ENDL; return false; } + + if (!mHasFramebufferObject) + { + mHasRequirements = FALSE; + + LL_WARNS("RenderInit") << "GL Drivers do not support GL_ARB_framebuffer_object" << LL_ENDL; + return false; + } stop_glerror(); @@ -758,12 +766,6 @@ bool LLGLManager::initGL() //HACK always disable texture multisample, use FXAA instead mHasTextureMultisample = FALSE; -#if LL_WINDOWS - if (mIsIntel && mGLVersion <= 3.f) - { //never try to use framebuffer objects on older intel drivers (crashy) - mHasFramebufferObject = FALSE; - } -#endif if (mHasFramebufferObject) { |