Bug 1560600 - Don't allow WebRender for AMD on non-nightly for non-Windows platforms. r=kats a=jcristau
☠☠ backed out by 90725f025a3b ☠ ☠
authorAndrew Osmond <aosmond@mozilla.com>
Fri, 21 Jun 2019 17:59:38 -0700
changeset 537075 1d577a6a7cd16bfa7f25c02dcfef10e32aa3bfc0
parent 537074 abc1d64c569b3ea3ffa0a00b441fea94884fa60f
child 537076 5c9288e6d56a6f27610ceca5e418431fca93119f
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats, jcristau
bugs1560600
milestone68.0
Bug 1560600 - Don't allow WebRender for AMD on non-nightly for non-Windows platforms. r=kats a=jcristau Differential Revision: https://phabricator.services.mozilla.com/D35569
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2598,17 +2598,24 @@ static FeatureState& WebRenderHardwareQu
               (deviceID >= 0x6700 && deviceID < 0x6720) ||
               (deviceID >= 0x6780 && deviceID < 0x6840) ||
               (deviceID >= 0x6860 && deviceID < 0x6880) ||
               (deviceID >= 0x6900 && deviceID < 0x6a00) ||
               (deviceID == 0x7300) ||
               (deviceID >= 0x9830 && deviceID < 0x9870) ||
               (deviceID >= 0x9900 && deviceID < 0x9a00)) {
             // we have a desktop CAYMAN, SI, CIK, VI, or GFX9 device
-            // so treat the device as qualified.
+            // so treat the device as qualified unless it is not Windows
+            // and not nightly.
+#if !defined(XP_WIN) && !defined(NIGHTLY_BUILD)
+            featureWebRenderQualified.Disable(
+                FeatureStatus::BlockedReleaseChannelAMD,
+                "Release channel and AMD",
+                NS_LITERAL_CSTRING("FEATURE_FAILURE_RELEASE_CHANNEL_AMD"));
+#endif  // !XPWIN && !NIGHTLY_BUILD
           } else {
             featureWebRenderQualified.Disable(
                 FeatureStatus::BlockedDeviceTooOld, "Device too old",
                 NS_LITERAL_CSTRING("FEATURE_FAILURE_DEVICE_TOO_OLD"));
           }
 #ifdef NIGHTLY_BUILD
         } else if (adapterVendorID == u"0x8086") {  // Intel
           const uint16_t supportedDevices[] = {