From 731600fe07de3e8c16c6462637d3c89d4002cb5e Mon Sep 17 00:00:00 2001
From: Andrew Osmond <aosmond@mozilla.com>
Date: Mon, 20 Jul 2020 19:49:31 +0000
Subject: [PATCH] Bug 1649528 - Part 1. Ship WebRender on Intel Gen 7/7.5 gt1,
 broxton and geminilake to early beta. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D84220
---
 widget/GfxDriverInfo.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/widget/GfxDriverInfo.cpp b/widget/GfxDriverInfo.cpp
index d52a01cc1df3..92767f933cd2 100644
--- a/widget/GfxDriverInfo.cpp
+++ b/widget/GfxDriverInfo.cpp
@@ -510,10 +510,7 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
       APPEND_DEVICE(0x0116);
       APPEND_DEVICE(0x0122);
       APPEND_DEVICE(0x0126);
-#endif
 
-#if defined(MOZ_WIDGET_GTK) || defined(NIGHTLY_BUILD)
-      // Gen7.5 not allowed until bug 1576637 is resolved.
       // gen7.5 gt1
       APPEND_DEVICE(0x0402);
       APPEND_DEVICE(0x0406);
@@ -543,7 +540,7 @@ const GfxDeviceFamily* GfxDriverInfo::GetDeviceFamily(DeviceFamily id) {
 #endif
       [[fallthrough]];
     case DeviceFamily::IntelModernRolloutWebRender:
-#ifdef NIGHTLY_BUILD
+#ifdef EARLY_BETA_OR_EARLIER
       // broxton (apollolake)
       APPEND_DEVICE(0x0a84);
       APPEND_DEVICE(0x1a84);