Skip to content

A
angle
Commit 9bc9ac8d by Peng Huang Committed by Commit Bot
Options

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: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarShahbaz Youssefi <syoussefi@chromium.org>
parent 57727c4e
Showing with 12 additions and 3 deletions
src/libANGLE/renderer/gl/renderergl_utils.cpp
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include "common/mathutil.h" #include "common/mathutil.h"
#include "common/platform.h" #include "common/platform.h"
#include "common/string_utils.h"
#include "gpu_info_util/SystemInfo.h" #include "gpu_info_util/SystemInfo.h"
#include "libANGLE/Buffer.h" #include "libANGLE/Buffer.h"
#include "libANGLE/Caps.h" #include "libANGLE/Caps.h"
...@@ -84,6 +85,13 @@ bool IsAdreno42xOr3xx(const FunctionsGL *functions) ...@@ -84,6 +85,13 @@ bool IsAdreno42xOr3xx(const FunctionsGL *functions)
return adrenoNumber < 430; 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, void ClearErrors(const FunctionsGL *functions,
const char *file, const char *file,
const char *function, const char *function,
...@@ -1838,9 +1846,10 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature ...@@ -1838,9 +1846,10 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
// TODO(jie.a.chen@intel.com): Clean up the bugs. // TODO(jie.a.chen@intel.com): Clean up the bugs.
// anglebug.com/3031 // anglebug.com/3031
// crbug.com/922936 // crbug.com/922936
ANGLE_FEATURE_CONDITION( // crbug.com/1184692
features, disableWorkerContexts, ANGLE_FEATURE_CONDITION(features, disableWorkerContexts,
(IsWindows() && (isIntel || isAMD)) || (IsLinux() && isNvidia) || IsIOS()); (IsWindows() && (isIntel || isAMD)) || (IsLinux() && isNvidia) ||
IsIOS() || IsAndroidEmulator(functions));
bool limitMaxTextureSize = isIntel && IsLinux() && GetLinuxOSVersion() < OSVersion(5, 0, 0); bool limitMaxTextureSize = isIntel && IsLinux() && GetLinuxOSVersion() < OSVersion(5, 0, 0);
ANGLE_FEATURE_CONDITION(features, limitMaxTextureSizeTo4096, ANGLE_FEATURE_CONDITION(features, limitMaxTextureSizeTo4096,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment