From 1eabffb0039bee3575eea4d71bdca6108f39bc28 Mon Sep 17 00:00:00 2001 From: Andrew Osmond Date: Wed, 27 Jan 2021 20:54:57 +0000 Subject: [PATCH] Bug 1689189 - Ship Software WebRender to users with large screens in nightly and early beta. r=jrmuizel Differential Revision: https://phabricator.services.mozilla.com/D103194 --- widget/GfxInfoX11.cpp | 11 +++++------ widget/windows/GfxInfo.cpp | 12 +++++------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp index 16f5fd07e2f8..77b6d7347570 100644 --- a/widget/GfxInfoX11.cpp +++ b/widget/GfxInfoX11.cpp @@ -784,17 +784,16 @@ const nsTArray& GfxInfo::GetGfxDriverInfo() { # if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || \ defined(__i386) || defined(__amd64__) APPEND_TO_DRIVER_BLOCKLIST_EXT( - OperatingSystem::Linux, ScreenSizeStatus::SmallAndMedium, - BatteryStatus::All, DesktopEnvironment::All, WindowProtocol::All, - DriverVendor::NonMesaAll, DeviceFamily::All, - nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE, + OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, + DesktopEnvironment::All, WindowProtocol::All, DriverVendor::NonMesaAll, + DeviceFamily::All, nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE, nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), "FEATURE_ROLLOUT_NIGHTLY_SOFTWARE_WR_NON_MESA_S_M_SCRN", ""); APPEND_TO_DRIVER_BLOCKLIST_EXT( - OperatingSystem::Linux, ScreenSizeStatus::SmallAndMedium, - BatteryStatus::All, DesktopEnvironment::All, WindowProtocol::All, + OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, + DesktopEnvironment::All, WindowProtocol::All, DriverVendor::HardwareMesaAll, DeviceFamily::All, nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE, nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_COMPARISON_IGNORED, diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp index 7a3e869e73d2..d42d5ce02f9b 100644 --- a/widget/windows/GfxInfo.cpp +++ b/widget/windows/GfxInfo.cpp @@ -1851,13 +1851,11 @@ const nsTArray& GfxInfo::GetGfxDriverInfo() { #ifdef EARLY_BETA_OR_EARLIER # if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || \ defined(__i386) || defined(__amd64__) - APPEND_TO_DRIVER_BLOCKLIST2_EXT( - OperatingSystem::Windows, ScreenSizeStatus::SmallAndMedium, - BatteryStatus::All, DesktopEnvironment::All, WindowProtocol::All, - DriverVendor::All, DeviceFamily::All, - nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE, - nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_COMPARISON_IGNORED, - V(0, 0, 0, 0), "FEATURE_ROLLOUT_NIGHTLY_SOFTWARE_WR_S_M_SCRN"); + APPEND_TO_DRIVER_BLOCKLIST2(OperatingSystem::Windows, DeviceFamily::All, + nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE, + nsIGfxInfo::FEATURE_ALLOW_ALWAYS, + DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0), + "FEATURE_ROLLOUT_NIGHTLY_SOFTWARE_WR_S_M_SCRN"); # endif #endif }