diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-10-19 13:21:17 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-10-19 13:21:17 -0500 |
| commit | fe51889b2914a9f117d5f19d91072716b5913579 (patch) | |
| tree | 35317e27314daec19ab20bd9d40702210a390472 /indra/newview/llviewershadermgr.cpp | |
| parent | 506a91beb83bc1fb9a5ee77ee83544b6293e534a (diff) | |
SH-2276 Force RenderMaxTextureIndex to be <= 16 regardless of settings
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 31ed210ae3..50910e26e5 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -357,6 +357,9 @@ void LLViewerShaderMgr::setShaders() LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits, (S32) gSavedSettings.getU32("RenderMaxTextureIndex")), 1); + //NEVER use more than 16 texture channels (work around for prevalent driver bug) + LLGLSLShader::sIndexedTextureChannels = llmin(LLGLSLShader::sIndexedTextureChannels, 16); + reentrance = true; if (LLRender::sGLCoreProfile || gGLManager.mGLVersion >= 2.f) |