Add environment overrides for ANGLE features.

src/common/string_utils.cpp

@@ -7,7 +7,7 @@
 //   String helper functions.
 //
 
-#include "string_utils.h"
+#include "common/string_utils.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -16,6 +16,7 @@
 #include <sstream>
 
 #include "common/platform.h"
+#include "common/system_utils.h"
 
 namespace angle
 {
@@ -209,4 +210,9 @@ bool ReplaceSubstring(std::string *str,
     return true;
 }
 
+std::vector<std::string> GetStringsFromEnvironmentVar(const char *varName, const char *separator)
+{
+    std::string environment = GetEnvironmentVar(varName);
+    return SplitString(environment, separator, TRIM_WHITESPACE, SPLIT_WANT_NONEMPTY);
+}
 }  // namespace angle

src/common/string_utils.h

@@ -81,6 +81,9 @@ bool ReplaceSubstring(std::string *str,
                       const std::string &substring,
                       const std::string &replacement);
 
+// Split up a string parsed from an environment variable.
+std::vector<std::string> GetStringsFromEnvironmentVar(const char *varName, const char *separator);
+
 }  // namespace angle
 
 #endif  // LIBANGLE_STRING_UTILS_H_

src/common/system_utils.cpp

@@ -6,7 +6,7 @@
 
 // system_utils.cpp: Implementation of common functions
 
-#include "system_utils.h"
+#include "common/system_utils.h"
 
 namespace angle
 {

src/common/system_utils.h

@@ -12,6 +12,8 @@
 #include "common/Optional.h"
 #include "common/angleutils.h"
 
+#include <string>
+
 namespace angle
 {
 std::string GetExecutablePath();

src/libANGLE/Display.cpp

@@ -1499,7 +1499,7 @@ void Display::initializeFrontendFeatures()
 
     mImplementation->initializeFrontendFeatures(&mFrontendFeatures);
 
-    rx::OverrideFeaturesWithDisplayState(&mFrontendFeatures, mState);
+    rx::ApplyFeatureOverrides(&mFrontendFeatures, mState);
 }
 
 const DisplayExtensions &Display::getExtensions() const

src/libANGLE/Overlay.cpp

@@ -9,6 +9,7 @@
 
 #include "libANGLE/Overlay.h"
 
+#include "common/string_utils.h"
 #include "common/system_utils.h"
 #include "libANGLE/Context.h"
 #include "libANGLE/Overlay_font_autogen.h"
@@ -61,18 +62,13 @@ void Overlay::destroy(const gl::Context *context)
 
 void Overlay::enableOverlayWidgetsFromEnvironment()
 {
-    std::istringstream angleOverlayWidgets(angle::GetEnvironmentVar("ANGLE_OVERLAY"));
-
-    std::set<std::string> enabledWidgets;
-    std::string widget;
-    while (getline(angleOverlayWidgets, widget, ':'))
-    {
-        enabledWidgets.insert(widget);
-    }
+    std::vector<std::string> enabledWidgets =
+        angle::GetStringsFromEnvironmentVar("ANGLE_OVERLAY", ":");
 
     for (const std::pair<const char *, WidgetId> &widgetName : kWidgetNames)
     {
-        if (enabledWidgets.count(widgetName.first) > 0)
+        if (std::find(enabledWidgets.begin(), enabledWidgets.end(), widgetName.first) !=
+            enabledWidgets.end())
         {
             mState.mOverlayWidgets[widgetName.second]->enabled = true;
             ++mState.mEnabledWidgetCount;

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -3864,7 +3864,7 @@ void Renderer11::initializeFeatures(angle::FeaturesD3D *features) const
     {
         d3d11::InitializeFeatures(mRenderer11DeviceCaps, mAdapterDescription, features);
     }
-    OverrideFeaturesWithDisplayState(features, mDisplay->getState());
+    ApplyFeatureOverrides(features, mDisplay->getState());
 }
 
 DeviceImpl *Renderer11::createEGLDevice()

src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp

@@ -3020,7 +3020,7 @@ void Renderer9::initializeFeatures(angle::FeaturesD3D *features) const
     {
         d3d9::InitializeFeatures(features);
     }
-    OverrideFeaturesWithDisplayState(features, mDisplay->getState());
+    ApplyFeatureOverrides(features, mDisplay->getState());
 }
 
 DeviceImpl *Renderer9::createEGLDevice()

src/libANGLE/renderer/gl/RendererGL.cpp

@@ -224,7 +224,7 @@ RendererGL::RendererGL(std::unique_ptr<FunctionsGL> functions,
     {
         nativegl_gl::InitializeFeatures(mFunctions.get(), &mFeatures);
     }
-    OverrideFeaturesWithDisplayState(&mFeatures, display->getState());
+    ApplyFeatureOverrides(&mFeatures, display->getState());
     mStateManager =
         new StateManagerGL(mFunctions.get(), getNativeCaps(), getNativeExtensions(), mFeatures);
     mBlitter          = new BlitGL(mFunctions.get(), mFeatures, mStateManager);

src/libANGLE/renderer/renderer_utils.cpp

@@ -9,20 +9,20 @@
 
 #include "libANGLE/renderer/renderer_utils.h"
 
+#include "common/string_utils.h"
+#include "common/system_utils.h"
+#include "common/utilities.h"
 #include "image_util/copyimage.h"
 #include "image_util/imageformats.h"
-
 #include "libANGLE/AttributeMap.h"
 #include "libANGLE/Context.h"
 #include "libANGLE/Display.h"
 #include "libANGLE/formatutils.h"
 #include "libANGLE/renderer/ContextImpl.h"
 #include "libANGLE/renderer/Format.h"
-
 #include "platform/Feature.h"
 
 #include <string.h>
-#include "common/utilities.h"
 
 namespace rx
 {
@@ -794,11 +794,18 @@ gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &r
     return rect;
 }
 
-void OverrideFeaturesWithDisplayState(angle::FeatureSetBase *features,
-                                      const egl::DisplayState &state)
+void ApplyFeatureOverrides(angle::FeatureSetBase *features, const egl::DisplayState &state)
 {
     features->overrideFeatures(state.featureOverridesEnabled, true);
     features->overrideFeatures(state.featureOverridesDisabled, false);
+
+    // Override with environment as well.
+    std::vector<std::string> overridesEnabled =
+        angle::GetStringsFromEnvironmentVar("ANGLE_FEATURE_OVERRIDES_ENABLED", ":");
+    std::vector<std::string> overridesDisabled =
+        angle::GetStringsFromEnvironmentVar("ANGLE_FEATURE_OVERRIDES_DISABLED", ":");
+    features->overrideFeatures(overridesEnabled, true);
+    features->overrideFeatures(overridesDisabled, false);
 }
 
 void GetSamplePosition(GLsizei sampleCount, size_t index, GLfloat *xy)

src/libANGLE/renderer/renderer_utils.h

@@ -235,8 +235,7 @@ angle::Result GetVertexRangeInfo(const gl::Context *context,
 gl::Rectangle ClipRectToScissor(const gl::State &glState, const gl::Rectangle &rect, bool invertY);
 
 // Helper method to intialize a FeatureSet with overrides from the DisplayState
-void OverrideFeaturesWithDisplayState(angle::FeatureSetBase *features,
-                                      const egl::DisplayState &state);
+void ApplyFeatureOverrides(angle::FeatureSetBase *features, const egl::DisplayState &state);
 
 template <typename In>
 uint32_t LineLoopRestartIndexCountHelper(GLsizei indexCount, const uint8_t *srcPtr)

src/libANGLE/renderer/vulkan/RendererVk.cpp

@@ -543,7 +543,6 @@ gl::Version LimitVersionTo(const gl::Version &current, const gl::Version &lower)
 RendererVk::RendererVk()
     : mDisplay(nullptr),
       mCapsInitialized(false),
-      mFeaturesInitialized(false),
       mInstance(VK_NULL_HANDLE),
       mEnableValidationLayers(false),
       mEnabledICD(vk::ICD::Default),
@@ -1071,12 +1070,7 @@ angle::Result RendererVk::initializeDevice(DisplayVk *displayVk, uint32_t queueF
     queryDeviceExtensionFeatures(deviceExtensionNames);
 
     // Initialize features and workarounds.
-    if (!displayVk->getState().featuresAllDisabled)
-    {
-        initFeatures(deviceExtensionNames);
-    }
-    OverrideFeaturesWithDisplayState(&mFeatures, displayVk->getState());
-    mFeaturesInitialized = true;
+    initFeatures(displayVk, deviceExtensionNames);
 
     // Selectively enable KHR_MAINTENANCE1 to support viewport flipping.
     if ((getFeatures().flipViewportY.enabled) &&
@@ -1441,8 +1435,14 @@ gl::Version RendererVk::getMaxConformantESVersion() const
     return LimitVersionTo(getMaxSupportedESVersion(), {3, 0});
 }
 
-void RendererVk::initFeatures(const ExtensionNameList &deviceExtensionNames)
+void RendererVk::initFeatures(DisplayVk *displayVk, const ExtensionNameList &deviceExtensionNames)
 {
+    if (displayVk->getState().featuresAllDisabled)
+    {
+        ApplyFeatureOverrides(&mFeatures, displayVk->getState());
+        return;
+    }
+
     bool isAMD      = IsAMD(mPhysicalDeviceProperties.vendorID);
     bool isIntel    = IsIntel(mPhysicalDeviceProperties.vendorID);
     bool isNvidia   = IsNvidia(mPhysicalDeviceProperties.vendorID);
@@ -1565,6 +1565,8 @@ void RendererVk::initFeatures(const ExtensionNameList &deviceExtensionNames)
 
     angle::PlatformMethods *platform = ANGLEPlatformCurrent();
     platform->overrideFeaturesVk(platform, &mFeatures);
+
+    ApplyFeatureOverrides(&mFeatures, displayVk->getState());
 }
 
 void RendererVk::initPipelineCacheVkKey()

src/libANGLE/renderer/vulkan/RendererVk.h

@@ -141,11 +141,7 @@ class RendererVk : angle::NonCopyable
     // Issues a new serial for linked shader modules. Used in the pipeline cache.
     Serial issueShaderSerial();
 
-    const angle::FeaturesVk &getFeatures() const
-    {
-        ASSERT(mFeaturesInitialized);
-        return mFeatures;
-    }
+    const angle::FeaturesVk &getFeatures() const { return mFeatures; }
     uint32_t getMaxVertexAttribDivisor() const { return mMaxVertexAttribDivisor; }
     VkDeviceSize getMaxVertexAttribStride() const { return mMaxVertexAttribStride; }
 
@@ -230,7 +226,7 @@ class RendererVk : angle::NonCopyable
 
     void queryDeviceExtensionFeatures(const ExtensionNameList &deviceExtensionNames);
 
-    void initFeatures(const ExtensionNameList &extensions);
+    void initFeatures(DisplayVk *display, const ExtensionNameList &extensions);
     void initPipelineCacheVkKey();
     angle::Result initPipelineCache(DisplayVk *display,
                                     vk::PipelineCache *pipelineCache,
@@ -252,7 +248,6 @@ class RendererVk : angle::NonCopyable
     mutable gl::TextureCapsMap mNativeTextureCaps;
     mutable gl::Extensions mNativeExtensions;
     mutable gl::Limitations mNativeLimitations;
-    mutable bool mFeaturesInitialized;
     mutable angle::FeaturesVk mFeatures;
 
     VkInstance mInstance;