Disable worker contexts on Android emulator

Bug: chromium:1184692 Change-Id: I1b15e24d0cddd287f32ecb7f28568658f16b776d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2735375 Commit-Queue: Peng Huang <penghuang@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>

Disable worker contexts on Android emulator
9bc9ac8d · Peng Huang · Commit Bot · 57727c4e · 9bc9ac8d
Commit 9bc9ac8d authored Mar 04, 2021 by Peng Huang Committed by Commit Bot Mar 09, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +12 -3

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -14,6 +14,7 @@

 #include "common/mathutil.h"
 #include "common/platform.h"
+#include "common/string_utils.h"
 #include "gpu_info_util/SystemInfo.h"
 #include "libANGLE/Buffer.h"
 #include "libANGLE/Caps.h"
@@ -84,6 +85,13 @@ bool IsAdreno42xOr3xx(const FunctionsGL *functions)
    return adrenoNumber < 430;
 }

+bool IsAndroidEmulator(const FunctionsGL *functions)
+{
+    constexpr char androidEmulator[] = "Android Emulator";
+    const char *nativeGLRenderer     = GetString(functions, GL_RENDERER);
+    return angle::BeginsWith(nativeGLRenderer, androidEmulator);
+}
+
 void ClearErrors(const FunctionsGL *functions,
                 const char *file,
                 const char *function,
@@ -1838,9 +1846,10 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
    // TODO(jie.a.chen@intel.com): Clean up the bugs.
    // anglebug.com/3031
    // crbug.com/922936
-    ANGLE_FEATURE_CONDITION(
-        features, disableWorkerContexts,
-        (IsWindows() && (isIntel || isAMD)) || (IsLinux() && isNvidia) || IsIOS());
+    // crbug.com/1184692
+    ANGLE_FEATURE_CONDITION(features, disableWorkerContexts,
+                            (IsWindows() && (isIntel || isAMD)) || (IsLinux() && isNvidia) ||
+                                IsIOS() || IsAndroidEmulator(functions));

    bool limitMaxTextureSize = isIntel && IsLinux() && GetLinuxOSVersion() < OSVersion(5, 0, 0);
    ANGLE_FEATURE_CONDITION(features, limitMaxTextureSizeTo4096,