summaryrefslogtreecommitdiff
path: root/indra/newview/llfeaturemanager.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-10-06 18:49:13 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-10-06 18:49:13 +0000
commit027ca696bd7bf222be63cf4d0af6e975b83a6815 (patch)
tree5c581b1bba52d39df5dba52dd1d38164c78aff49 /indra/newview/llfeaturemanager.cpp
parent4778f9497ec8b871c297b4efc4c0a44ee5726af1 (diff)
parent3e99853b2984a40093ff6b504abfcabe065b251b (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/llfeaturemanager.cpp')
-rw-r--r--indra/newview/llfeaturemanager.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index e6bbe234b3..98c8531cd6 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -670,11 +670,7 @@ void LLFeatureManager::applyBaseMasks()
}
// now all those wacky ones
- if (!gGLManager.mHasFragmentShader)
- {
- maskFeatures("NoPixelShaders");
- }
- if (!gGLManager.mHasVertexShader || !mGPUSupported)
+ if (!mGPUSupported)
{
maskFeatures("NoVertexShaders");
}