diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-10-05 15:59:21 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-10-06 10:59:00 -0600 |
| commit | 3e99853b2984a40093ff6b504abfcabe065b251b (patch) | |
| tree | 5c581b1bba52d39df5dba52dd1d38164c78aff49 /indra/newview/llviewershadermgr.cpp | |
| parent | 4c07eaa560c24303126057b7cf43441d87d520e5 (diff) | |
SL-16138 remove checks for now-mandatory capabilities
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index be5c22e7c3..7dcf29eb75 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -384,7 +384,7 @@ void LLViewerShaderMgr::initAttribsAndUniforms(void) S32 LLViewerShaderMgr::getShaderLevel(S32 type) { - return LLPipeline::sDisableShaders ? 0 : mShaderLevel[type]; + return mShaderLevel[type]; } //============================================================================ @@ -400,15 +400,6 @@ 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); |