mozilla-central: changeset 543643:c14317d9e192d1298ac8a95cf297e4f0dc5cc3bd

author	Jamie Nicol <jnicol@mozilla.com>
	Thu, 06 Aug 2020 20:35:09 +0000
changeset 543643	c14317d9e192d1298ac8a95cf297e4f0dc5cc3bd
parent 543642	99b9eff39f1b509fd0f5760500a75eb9b2a540bc
child 543644	06538f141210b2683b8efa822ad90cb267eeacf2
push id	37677
push user	malexandru@mozilla.com
push date	Fri, 07 Aug 2020 03:32:06 +0000
treeherder	mozilla-central@d51942b1e2d8 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ktaeleman, geckoview-reviewers, snorp
bugs	1656554
milestone	81.0a1
first release with	nightly linux32 cc8993c8140a / 81.0a1 / 20200807093158 / files nightly linux64 cc8993c8140a / 81.0a1 / 20200807093158 / files nightly mac cc8993c8140a / 81.0a1 / 20200807093158 / files nightly win32 cc8993c8140a / 81.0a1 / 20200807093158 / files nightly win64 cc8993c8140a / 81.0a1 / 20200807093158 / files
last release without	nightly linux32 95cbd1379138 / 81.0a1 / 20200806215439 / files nightly linux64 95cbd1379138 / 81.0a1 / 20200806215439 / files nightly mac 95cbd1379138 / 81.0a1 / 20200806215439 / files nightly win32 95cbd1379138 / 81.0a1 / 20200806215439 / files nightly win64 95cbd1379138 / 81.0a1 / 20200806215439 / files

--- a/widget/android/GfxInfo.cpp
+++ b/widget/android/GfxInfo.cpp
@@ -574,18 +574,21 @@ nsresult GfxInfo::GetFeatureStatusImpl(
       bool isUnblocked = false;
       const nsCString& gpu = mGLStrings->Renderer();
       NS_LossyConvertUTF16toASCII model(mModel);
 
 #ifdef NIGHTLY_BUILD
       // On nightly enable all Adreno 5xx GPUs
       isUnblocked |= gpu.Find("Adreno (TM) 5", /*ignoreCase*/ true) >= 0;
 #endif
-      // Enable Webrender on all pixel 2 models (Subset of Adreno 5xx)
-      isUnblocked |= model.Find("Pixel 2", /*ignoreCase*/ true) >= 0;
+      // Enable Webrender on all Adreno 5xx GPUs, excluding 505 and 506.
+      isUnblocked |=
+          gpu.Find("Adreno (TM) 5", /*ignoreCase*/ true) >= 0 &&
+          gpu.Find("Adreno (TM) 505", /*ignoreCase*/ true) == kNotFound &&
+          gpu.Find("Adreno (TM) 506", /*ignoreCase*/ true) == kNotFound;
 
       // Enable Webrender on all Adreno 6xx devices
       isUnblocked |= gpu.Find("Adreno (TM) 6", /*ignoreCase*/ true) >= 0;
 
       if (!isUnblocked) {
         *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
         aFailureId = "FEATURE_FAILURE_WEBRENDER_BLOCKED_DEVICE";
       } else {