Bug 1560600 - Don't allow WebRender for AMD on non-nightly for non-Windows platforms. r=kats
authorAndrew Osmond <aosmond@mozilla.com>
Fri, 21 Jun 2019 17:59:38 -0700
changeset 479935 60c8d0cdd443bad2f5c840196ea3a99ba45c28c1
parent 479934 d30796cfdeb95d4c969f23d0d1081ac273c7c116
child 479936 8176e402191791a0d82e56592052863b7212c924
child 479952 15984bd142b7ae1df1c10f4f572c8a37bac74b32
push id113505
push useraosmond@gmail.com
push dateMon, 24 Jun 2019 17:56:43 +0000
treeherdermozilla-inbound@60c8d0cdd443 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1560600
milestone69.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1560600 - Don't allow WebRender for AMD on non-nightly for non-Windows platforms. r=kats Differential Revision: https://phabricator.services.mozilla.com/D35569
gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -2647,17 +2647,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"));
           }
         } else if (adapterVendorID == u"0x8086") {  // Intel
           const uint16_t supportedDevices[] = {
               // skylake gt2+