Cleanup disable_program_binary workaround

include/platform/Feature.h

@@ -170,9 +170,9 @@ struct FeatureSetBase
     FeatureMap members = FeatureMap();
 
   public:
-    void overrideFeatures(const std::vector<std::string> &feature_names, const bool enabled)
+    void overrideFeatures(const std::vector<std::string> &featureNames, bool enabled)
     {
-        for (const std::string &name : feature_names)
+        for (const std::string &name : featureNames)
         {
             if (members.find(name) != members.end())
             {

src/libANGLE/Context.cpp

@@ -3314,16 +3314,6 @@ void Context::initCaps()
         mState.mCaps.maxSmoothLineWidth            = 1.0f;
     }
 
-    // If we're capturing application calls for replay, don't expose any binary formats to prevent
-    // traces from trying to use cached results
-    if (getFrameCapture()->enabled())
-    {
-        INFO() << "Limiting binary format support count to zero while FrameCapture enabled"
-               << std::endl;
-        mState.mCaps.shaderBinaryFormats.clear();
-        mState.mCaps.programBinaryFormats.clear();
-    }
-
 #if 0
 // This logging can generate a lot of spam in test suites that create many contexts
 #    define ANGLE_LOG_LIMITED_CAP(cap, limit)                                               \
@@ -3440,10 +3430,20 @@ void Context::initCaps()
         }
     }
 
+    // If we're capturing application calls for replay, don't expose any binary formats to prevent
+    // traces from trying to use cached results
+    if (getFrameCapture()->enabled())
+    {
+        INFO() << "Limiting binary format support count to zero while FrameCapture enabled"
+               << std::endl;
+        mDisplay->overrideFrontendFeatures({"disable_program_binary"}, true);
+    }
+
     // Disable support for OES_get_program_binary
     if (mDisplay->getFrontendFeatures().disableProgramBinary.enabled)
     {
         mState.mExtensions.getProgramBinaryOES = false;
+        mState.mCaps.shaderBinaryFormats.clear();
         mState.mCaps.programBinaryFormats.clear();
     }
 

src/libANGLE/Display.cpp

@@ -1871,6 +1871,11 @@ EGLint Display::programCacheResize(EGLint limit, EGLenum mode)
     }
 }
 
+void Display::overrideFrontendFeatures(const std::vector<std::string> &featureNames, bool enabled)
+{
+    mFrontendFeatures.overrideFeatures(featureNames, enabled);
+}
+
 const char *Display::queryStringi(const EGLint name, const EGLint index)
 {
     const char *result = nullptr;

src/libANGLE/Display.h

@@ -237,6 +237,7 @@ class Display final : public LabeledObject,
     const ContextSet &getContextSet() { return mContextSet; }
 
     const angle::FrontendFeatures &getFrontendFeatures() { return mFrontendFeatures; }
+    void overrideFrontendFeatures(const std::vector<std::string> &featureNames, bool enabled);
 
     const angle::FeatureList &getFeatures() const { return mFeatures; }