diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2019-09-30 21:01:22 +0300 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2019-09-30 21:01:22 +0300 |
| commit | 4c006e76e39a8b59dc6f9c890e5a27d38b5ece50 (patch) | |
| tree | adeab008934ab20a59ff10333a041b41cd1560c7 /indra/newview/llappviewer.cpp | |
| parent | 74904f39e15961ada40221be418bbd758a5969ef (diff) | |
SL-8191 RenderUseVAO with Basic Shaders turned off caused textures not to show
- Disable VAO for fixed pipeline + UI
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ff897ef962..cf6e31fa4d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -568,7 +568,7 @@ static void settings_to_globals() LLRender::sGLCoreProfile = gSavedSettings.getBOOL("RenderGLCoreProfile"); LLRender::sNsightDebugSupport = gSavedSettings.getBOOL("RenderNsightDebugSupport"); - LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO"); + LLVertexBuffer::sUseVAO = gSavedSettings.getBOOL("RenderUseVAO") && LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_OBJECT) > 0; LLImageGL::sGlobalUseAnisotropic = gSavedSettings.getBOOL("RenderAnisotropic"); LLImageGL::sCompressTextures = gSavedSettings.getBOOL("RenderCompressTextures"); LLVOVolume::sLODFactor = llclamp(gSavedSettings.getF32("RenderVolumeLODFactor"), 0.01f, MAX_LOD_FACTOR); |