Bug 1654032 - Enable Webrender on beta/release for Adreno 6xx devices. r=jnicol,geckoview-reviewers,agi

Differential Revision: https://phabricator.services.mozilla.com/D84203

widget/android/GfxInfo.cpp

@@ -572,19 +572,19 @@ nsresult GfxInfo::GetFeatureStatusImpl(
 
     if (aFeature == FEATURE_WEBRENDER) {
       bool isUnblocked = false;
-#ifdef NIGHTLY_BUILD
-      // On nightly enable all Adreno GPUs
       const nsCString& gpu = mGLStrings->Renderer();
-      isUnblocked |= gpu.Find("Adreno (TM) 5", /*ignoreCase*/ true) >= 0 ||
-                     gpu.Find("Adreno (TM) 6", /*ignoreCase*/ true) >= 0;
-#else
-      // Only allow pixel 2/3 devices on beta/release builds
       NS_LossyConvertUTF16toASCII model(mModel);
-      isUnblocked |= model.Find("Pixel 2", /*ignoreCase*/ true) >=
-                         0 ||  // Find substring to include all Pixel 2 models
-                     model.Find("Pixel 3", /*ignoreCase*/ true) >=
-                         0;  // Find substring to include all Pixel 3 models
+
+#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 6xx devices
+      isUnblocked |= gpu.Find("Adreno (TM) 6", /*ignoreCase*/ true) >= 0;
+
       if (!isUnblocked) {
         *aStatus = nsIGfxInfo::FEATURE_BLOCKED_DEVICE;
         aFailureId = "FEATURE_FAILURE_WEBRENDER_BLOCKED_DEVICE";