Vulkan: Allow Android properties to override features

include/platform/Feature.h

@@ -188,6 +188,8 @@ struct FeatureSetBase
             features->push_back(it->second);
         }
     }
+
+    const FeatureMap &getFeatures() const { return members; }
 };
 
 inline FeatureSetBase::FeatureSetBase()  = default;

src/common/string_utils.cpp

@@ -235,9 +235,11 @@ bool ReplaceSubstring(std::string *str,
     return true;
 }
 
-std::vector<std::string> GetStringsFromEnvironmentVar(const char *varName, const char *separator)
+std::vector<std::string> GetStringsFromEnvironmentVarOrAndroidProperty(const char *varName,
+                                                                       const char *propertyName,
+                                                                       const char *separator)
 {
-    std::string environment = GetEnvironmentVar(varName);
+    std::string environment = GetEnvironmentVarOrAndroidProperty(varName, propertyName);
     return SplitString(environment, separator, TRIM_WHITESPACE, SPLIT_WANT_NONEMPTY);
 }
 

src/common/string_utils.h

@@ -94,7 +94,9 @@ bool ReplaceSubstring(std::string *str,
                       const std::string &replacement);
 
 // Split up a string parsed from an environment variable.
-std::vector<std::string> GetStringsFromEnvironmentVar(const char *varName, const char *separator);
+std::vector<std::string> GetStringsFromEnvironmentVarOrAndroidProperty(const char *varName,
+                                                                       const char *propertyName,
+                                                                       const char *separator);
 
 // Split up a string parsed from environment variable or via Android property, use cached result if
 // available.

src/libANGLE/Overlay.cpp

@@ -58,8 +58,8 @@ void Overlay::destroy(const gl::Context *context)
 
 void Overlay::enableOverlayWidgetsFromEnvironment()
 {
-    std::vector<std::string> enabledWidgets =
-        angle::GetStringsFromEnvironmentVar("ANGLE_OVERLAY", ":");
+    std::vector<std::string> enabledWidgets = angle::GetStringsFromEnvironmentVarOrAndroidProperty(
+        "ANGLE_OVERLAY", "debug.angle.overlay", ":");
 
     for (const std::pair<const char *, WidgetId> &widgetName : kWidgetNames)
     {

src/libANGLE/renderer/renderer_utils.cpp

@@ -902,18 +902,46 @@ gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &r
     return clippedRect;
 }
 
+void LogFeatureStatus(const angle::FeatureSetBase &features,
+                      const std::vector<std::string> &featureNames,
+                      bool enabled)
+{
+    for (const std::string &name : featureNames)
+    {
+        if (features.getFeatures().find(name) != features.getFeatures().end())
+        {
+            INFO() << "Feature: " << name << (enabled ? " enabled" : " disabled");
+        }
+        else
+        {
+            WARN() << "Feature: " << name << " is not a valid feature name.";
+        }
+    }
+}
+
 void ApplyFeatureOverrides(angle::FeatureSetBase *features, const egl::DisplayState &state)
 {
     features->overrideFeatures(state.featureOverridesEnabled, true);
     features->overrideFeatures(state.featureOverridesDisabled, false);
 
     // Override with environment as well.
+    constexpr char kAngleFeatureOverridesEnabledEnvName[]  = "ANGLE_FEATURE_OVERRIDES_ENABLED";
+    constexpr char kAngleFeatureOverridesDisabledEnvName[] = "ANGLE_FEATURE_OVERRIDES_DISABLED";
+    constexpr char kAngleFeatureOverridesEnabledPropertyName[] =
+        "debug.angle.feature_overrides_enabled";
+    constexpr char kAngleFeatureOverridesDisabledPropertyName[] =
+        "debug.angle.feature_overrides_disabled";
     std::vector<std::string> overridesEnabled =
-        angle::GetStringsFromEnvironmentVar("ANGLE_FEATURE_OVERRIDES_ENABLED", ":");
+        angle::GetCachedStringsFromEnvironmentVarOrAndroidProperty(
+            kAngleFeatureOverridesEnabledEnvName, kAngleFeatureOverridesEnabledPropertyName, ":");
     std::vector<std::string> overridesDisabled =
-        angle::GetStringsFromEnvironmentVar("ANGLE_FEATURE_OVERRIDES_DISABLED", ":");
+        angle::GetCachedStringsFromEnvironmentVarOrAndroidProperty(
+            kAngleFeatureOverridesDisabledEnvName, kAngleFeatureOverridesDisabledPropertyName, ":");
     features->overrideFeatures(overridesEnabled, true);
+    LogFeatureStatus(*features, overridesEnabled, true);
+
     features->overrideFeatures(overridesDisabled, false);
+    LogFeatureStatus(*features, overridesDisabled, false);
 }
 
 void GetSamplePosition(GLsizei sampleCount, size_t index, GLfloat *xy)