diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:28:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:28:15 +0200 |
| commit | 27e197459da275d2cd8847aa36e6c6bc4720e5c5 (patch) | |
| tree | fccc0ceaac90e03939d37e54cb8519a0132993cf /indra/newview/llviewershadermgr.cpp | |
| parent | 1a1465dab94a2829cedb4ee4cd0c0169cea0fdeb (diff) | |
| parent | 2ab914a9cdd1ad809879aca05dbf4b624949ecea (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index ff7647a7e4..f610335b07 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -399,7 +399,8 @@ void LLViewerShaderMgr::setShaders() return; } - LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits, (S32) gSavedSettings.getU32("RenderMaxTextureIndex")), 1); + static LLCachedControl<U32> max_texture_index(gSavedSettings, "RenderMaxTextureIndex", 16); + LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits, (S32) max_texture_index), 1); //NEVER use more than 16 texture channels (work around for prevalent driver bug) LLGLSLShader::sIndexedTextureChannels = llmin(LLGLSLShader::sIndexedTextureChannels, 16); |