diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-02-14 16:11:30 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-02-14 16:11:30 -0600 |
| commit | 4f18f9d6bd1e11b92040fbcc5ca1c2a173d38fc9 (patch) | |
| tree | 72bf43dced757109cba50c3850f91e126e561956 /indra/newview/llviewershadermgr.cpp | |
| parent | 60fa5c3d4e23967d1ecd1e5189685ca94223cfb4 (diff) | |
SH-2908 More complete GLSL 1.20 compatibility pass.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 36a402e05e..c84fb8facb 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -363,6 +363,12 @@ void LLViewerShaderMgr::setShaders() //NEVER use more than 16 texture channels (work around for prevalent driver bug) LLGLSLShader::sIndexedTextureChannels = llmin(LLGLSLShader::sIndexedTextureChannels, 16); + if (gGLManager.mGLSLVersionMajor < 1 || + (gGLManager.mGLSLVersionMajor == 1 && gGLManager.mGLSLVersionMinor <= 20)) + { //NEVER use indexed texture rendering when GLSL version is 1.20 or earlier + LLGLSLShader::sIndexedTextureChannels = 1; + } + reentrance = true; if (LLRender::sGLCoreProfile) |