diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-10-06 18:49:13 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-06 18:49:13 +0000 |
| commit | 027ca696bd7bf222be63cf4d0af6e975b83a6815 (patch) | |
| tree | 5c581b1bba52d39df5dba52dd1d38164c78aff49 /indra/newview/pipeline.cpp | |
| parent | 4778f9497ec8b871c297b4efc4c0a44ee5726af1 (diff) | |
| parent | 3e99853b2984a40093ff6b504abfcabe065b251b (diff) | |
Merged in euclid-16138 (pull request #720)
SL-16138 avoid redundant shader binds, and related cleanup
Approved-by: Dave Parks
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index d7acf2ec0e..c0b469af81 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -338,7 +338,6 @@ S32 LLPipeline::sUseOcclusion = 0; bool LLPipeline::sDelayVBUpdate = true; bool LLPipeline::sAutoMaskAlphaDeferred = true; bool LLPipeline::sAutoMaskAlphaNonDeferred = false; -bool LLPipeline::sDisableShaders = false; bool LLPipeline::sRenderTransparentWater = true; bool LLPipeline::sRenderBump = true; bool LLPipeline::sBakeSunlight = false; @@ -1393,10 +1392,7 @@ void LLPipeline::restoreGL() bool LLPipeline::canUseVertexShaders() { - if (sDisableShaders || - !gGLManager.mHasVertexShader || - !gGLManager.mHasFragmentShader || - (assertInitialized() && mVertexShadersLoaded != 1) ) + if ((assertInitialized() && mVertexShadersLoaded != 1) ) { return false; } @@ -1408,8 +1404,7 @@ bool LLPipeline::canUseVertexShaders() bool LLPipeline::canUseWindLightShaders() const { - return (!LLPipeline::sDisableShaders && - gWLSkyProgram.mProgramObject != 0 && + return (gWLSkyProgram.mProgramObject != 0 && LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_WINDLIGHT) > 1); } |