diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-11-11 15:43:06 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-11-11 15:43:06 -0700 |
commit | 21e2f3e974cfe8e337a7dae7dc26e68fb3c2c4ba (patch) | |
tree | c174e7cc65e82e3efd7d119e5644162187369c04 /indra/newview/llviewershadermgr.cpp | |
parent | f9a09406b38ad62e1db5914a96e462002c80fce9 (diff) | |
parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) |
Merge branch 'master' 6.4.12 into DRTVWR-510
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rw-r--r-- | indra/newview/llviewershadermgr.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index f108d96320..be5c22e7c3 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -400,6 +400,15 @@ void LLViewerShaderMgr::setShaders() return; } + if (!gGLManager.mHasShaderObjects + || !gGLManager.mHasVertexShader + || !gGLManager.mHasFragmentShader) + { + // Viewer will show 'hardware requirements' warning later + LL_INFOS("ShaderLoading") << "Shaders not supported" << LL_ENDL; + return; + } + static LLCachedControl<U32> max_texture_index(gSavedSettings, "RenderMaxTextureIndex", 16); LLGLSLShader::sIndexedTextureChannels = llmax(llmin(gGLManager.mNumTextureImageUnits, (S32) max_texture_index), 1); |