mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-18 07:45:30 +00:00
Bug 1654271 - Ship WebRender on < OSX 10.16 and Intel Gen 6 GT2 and Gen 7 to release. r=nical
Also ship to release if the Intel driver is 21.20.16.4550 or later. Add Intel Gen 6 GT1 (Sandybridge) and allow it to ride to early beta. Differential Revision: https://phabricator.services.mozilla.com/D89613
This commit is contained in:
Andrew Osmond
parent
221455cf7a
commit
fe2bf67e1b
@ -456,34 +456,32 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
|
||||
APPEND_RANGE(0x06c0, INT32_MAX);
|
||||
break;
|
||||
case DeviceFamily::IntelRolloutWebRender:
|
||||
// broadwell gt1 (gen8)
|
||||
APPEND_DEVICE(0x1602);
|
||||
APPEND_DEVICE(0x1606);
|
||||
APPEND_DEVICE(0x160a);
|
||||
APPEND_DEVICE(0x160b);
|
||||
APPEND_DEVICE(0x160d);
|
||||
APPEND_DEVICE(0x160e);
|
||||
|
||||
#ifdef EARLY_BETA_OR_EARLIER
|
||||
// gen7 gt2
|
||||
APPEND_DEVICE(0x0162);
|
||||
APPEND_DEVICE(0x0166);
|
||||
APPEND_DEVICE(0x016a);
|
||||
// sandybridge gen6 gt1
|
||||
APPEND_DEVICE(0x0102);
|
||||
APPEND_DEVICE(0x0106);
|
||||
APPEND_DEVICE(0x010a);
|
||||
#endif
|
||||
|
||||
// gen6 gt2
|
||||
[[fallthrough]];
|
||||
case DeviceFamily::IntelModernRolloutWebRender:
|
||||
// sandybridge gen6 gt2
|
||||
APPEND_DEVICE(0x0112);
|
||||
APPEND_DEVICE(0x0116);
|
||||
APPEND_DEVICE(0x0122);
|
||||
APPEND_DEVICE(0x0126);
|
||||
|
||||
// gen7 gt1
|
||||
// ivybridge gen7 gt1
|
||||
APPEND_DEVICE(0x0152);
|
||||
APPEND_DEVICE(0x0156);
|
||||
APPEND_DEVICE(0x015a);
|
||||
#endif
|
||||
[[fallthrough]];
|
||||
case DeviceFamily::IntelModernRolloutWebRender:
|
||||
// gen7.5 gt1
|
||||
|
||||
// ivybridge gen7 gt2
|
||||
APPEND_DEVICE(0x0162);
|
||||
APPEND_DEVICE(0x0166);
|
||||
APPEND_DEVICE(0x016a);
|
||||
|
||||
// haswell gen7.5 gt1
|
||||
APPEND_DEVICE(0x0402);
|
||||
APPEND_DEVICE(0x0406);
|
||||
APPEND_DEVICE(0x040a);
|
||||
@ -505,7 +503,7 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
|
||||
APPEND_DEVICE(0x0d0b);
|
||||
APPEND_DEVICE(0x0d0e);
|
||||
|
||||
// gen7.5 gt2
|
||||
// haswell gen7.5 gt2
|
||||
APPEND_DEVICE(0x0412);
|
||||
APPEND_DEVICE(0x0416);
|
||||
APPEND_DEVICE(0x041a);
|
||||
@ -517,7 +515,7 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
|
||||
APPEND_DEVICE(0x0a1b);
|
||||
APPEND_DEVICE(0x0a1e);
|
||||
|
||||
// gen7.5 gt3
|
||||
// haswell gen7.5 gt3
|
||||
APPEND_DEVICE(0x0422);
|
||||
APPEND_DEVICE(0x0426);
|
||||
APPEND_DEVICE(0x042a);
|
||||
@ -552,6 +550,14 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
|
||||
APPEND_DEVICE(0x3184);
|
||||
APPEND_DEVICE(0x3185);
|
||||
#endif
|
||||
// broadwell gt1 (gen8)
|
||||
APPEND_DEVICE(0x1602);
|
||||
APPEND_DEVICE(0x1606);
|
||||
APPEND_DEVICE(0x160a);
|
||||
APPEND_DEVICE(0x160b);
|
||||
APPEND_DEVICE(0x160d);
|
||||
APPEND_DEVICE(0x160e);
|
||||
|
||||
// broadwell gt2+ (gen8)
|
||||
APPEND_DEVICE(0x1612);
|
||||
APPEND_DEVICE(0x1616);
|
||||
|
||||
@ -143,6 +143,7 @@ enum class OperatingSystem : uint8_t {
|
||||
OSX10_13,
|
||||
OSX10_14,
|
||||
OSX10_15,
|
||||
OSX10_16,
|
||||
Android,
|
||||
Ios
|
||||
};
|
||||
|
||||
@ -327,6 +327,8 @@ static OperatingSystem BlocklistOSToOperatingSystem(const nsAString& os) {
|
||||
return OperatingSystem::OSX10_14;
|
||||
else if (os.EqualsLiteral("Darwin 19"))
|
||||
return OperatingSystem::OSX10_15;
|
||||
else if (os.EqualsLiteral("Darwin 20"))
|
||||
return OperatingSystem::OSX10_16;
|
||||
else if (os.EqualsLiteral("Android"))
|
||||
return OperatingSystem::Android;
|
||||
// For historical reasons, "All" in blocklist means "All Windows"
|
||||
|
||||
@ -54,6 +54,8 @@ static OperatingSystem OSXVersionToOperatingSystem(uint32_t aOSXVersion) {
|
||||
return OperatingSystem::OSX10_14;
|
||||
case 15:
|
||||
return OperatingSystem::OSX10_15;
|
||||
case 16:
|
||||
return OperatingSystem::OSX10_16;
|
||||
}
|
||||
}
|
||||
|
||||
@ -383,7 +385,7 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
|
||||
OperatingSystem::OSX, DeviceFamily::All, nsIGfxInfo::FEATURE_GL_SWIZZLE,
|
||||
nsIGfxInfo::FEATURE_BLOCKED_DEVICE, "FEATURE_FAILURE_MAC_GPU_SWITCHING_NO_SWIZZLE");
|
||||
|
||||
#ifdef EARLY_BETA_OR_EARLIER
|
||||
// FEATURE_WEBRENDER - ALLOWLIST
|
||||
IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX, DeviceFamily::IntelRolloutWebRender,
|
||||
nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
|
||||
"FEATURE_ROLLOUT_INTEL_MAC");
|
||||
@ -397,7 +399,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
|
||||
IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX, DeviceFamily::NvidiaRolloutWebRender,
|
||||
nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
|
||||
"FEATURE_ROLLOUT_NVIDIA_MAC");
|
||||
#endif
|
||||
}
|
||||
return *sDriverInfo;
|
||||
}
|
||||
@ -435,7 +436,7 @@ nsresult GfxInfo::GetFeatureStatusImpl(int32_t aFeature, int32_t* aStatus,
|
||||
return NS_OK;
|
||||
}
|
||||
#ifndef EARLY_BETA_OR_EARLIER
|
||||
else if (aFeature == nsIGfxInfo::FEATURE_WEBRENDER) {
|
||||
else if (aFeature == nsIGfxInfo::FEATURE_WEBRENDER && os == OperatingSystem::OSX10_16) {
|
||||
*aStatus = nsIGfxInfo::FEATURE_BLOCKED_OS_VERSION;
|
||||
aFailureId = "FEATURE_UNQUALIFIED_WEBRENDER_MAC";
|
||||
return NS_OK;
|
||||
|
||||
@ -1816,7 +1816,7 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
|
||||
BatteryStatus::Present, DesktopEnvironment::All, WindowProtocol::All,
|
||||
DriverVendor::All, DeviceFamily::IntelModernRolloutWebRender,
|
||||
nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
|
||||
DRIVER_GREATER_THAN_OR_EQUAL, V(23, 20, 16, 4973),
|
||||
DRIVER_GREATER_THAN_OR_EQUAL, V(21, 20, 16, 4550),
|
||||
"FEATURE_ROLLOUT_BATTERY_INTEL");
|
||||
|
||||
APPEND_TO_DRIVER_BLOCKLIST2_EXT(
|
||||
@ -1839,7 +1839,7 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
|
||||
DesktopEnvironment::All, WindowProtocol::All, DriverVendor::All,
|
||||
DeviceFamily::IntelRolloutWebRender, nsIGfxInfo::FEATURE_WEBRENDER,
|
||||
nsIGfxInfo::FEATURE_ALLOW_ALWAYS, DRIVER_COMPARISON_IGNORED,
|
||||
V(0, 0, 0, 0), "FEATURE_ROLLOUT_EARLY_BETA_INTEL");
|
||||
V(0, 0, 0, 0), "FEATURE_ROLLOUT_EARLY_BETA_OR_EARLIER_INTEL");
|
||||
#endif
|
||||
|
||||
#ifdef NIGHTLY_BUILD
|
||||
@ -1849,13 +1849,6 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
|
||||
DeviceFamily::NvidiaRolloutWebRender, nsIGfxInfo::FEATURE_WEBRENDER,
|
||||
nsIGfxInfo::FEATURE_ALLOW_QUALIFIED, DRIVER_COMPARISON_IGNORED,
|
||||
V(0, 0, 0, 0), "FEATURE_ROLLOUT_NIGHTLY_LISTED_NVIDIA");
|
||||
|
||||
APPEND_TO_DRIVER_BLOCKLIST2_EXT(
|
||||
OperatingSystem::Windows, ScreenSizeStatus::All, BatteryStatus::All,
|
||||
DesktopEnvironment::All, WindowProtocol::All, DriverVendor::All,
|
||||
DeviceFamily::IntelRolloutWebRender, nsIGfxInfo::FEATURE_WEBRENDER,
|
||||
nsIGfxInfo::FEATURE_ALLOW_QUALIFIED, DRIVER_COMPARISON_IGNORED,
|
||||
V(0, 0, 0, 0), "FEATURE_ROLLOUT_NIGHTLY_LISTED_INTEL");
|
||||
#endif
|
||||
|
||||
////////////////////////////////////
|
||||
|
||||
Loading…
Reference in New Issue
Block a user