Backed out changeset b149d1f43e95 (bug 1691964) for wd failures on minimize.py CLOSED TREE

gfx/webrender_bindings/RenderCompositor.cpp

@@ -154,8 +154,7 @@ UniquePtr<RenderCompositor> RenderCompositor::Create(
     return RenderCompositorNativeSWGL::Create(std::move(aWidget), aError);
 #elif defined(XP_WIN)
     if (StaticPrefs::gfx_webrender_software_d3d11_AtStartup() &&
-        gfx::gfxConfig::IsEnabled(gfx::Feature::D3D11_COMPOSITING) &&
-        !gfxPlatform::IsHeadless()) {
+        gfx::gfxConfig::IsEnabled(gfx::Feature::D3D11_COMPOSITING)) {
       UniquePtr<RenderCompositor> comp =
           RenderCompositorD3D11SWGL::Create(std::move(aWidget), aError);
       if (comp) {

widget/windows/GfxInfo.cpp

@@ -1837,6 +1837,17 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
         nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED,
         V(0, 0, 0, 0), "FEATURE_FAILURE_BUG_1603515");
 
+    ////////////////////////////////////
+    // FEATURE_WEBRENDER_SOFTWARE
+
+    // TODO(aosmond): Bug 1678044 - wdspec tests ignore enable/disable-webrender
+    // Once the test infrastructure is fixed, we can remove this blocklist rule
+    APPEND_TO_DRIVER_BLOCKLIST2(
+        OperatingSystem::Windows, DeviceFamily::AmazonAll,
+        nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE,
+        nsIGfxInfo::FEATURE_BLOCKED_DEVICE, DRIVER_COMPARISON_IGNORED,
+        V(0, 0, 0, 0), "FEATURE_FAILURE_BUG_1678044");
+
     ////////////////////////////////////
     // FEATURE_WEBRENDER_SOFTWARE - ALLOWLIST
 #ifdef EARLY_BETA_OR_EARLIER
@@ -1846,7 +1857,7 @@ const nsTArray<GfxDriverInfo>& GfxInfo::GetGfxDriverInfo() {
                                 nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE,
                                 nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
                                 DRIVER_COMPARISON_IGNORED, V(0, 0, 0, 0),
-                                "FEATURE_ROLLOUT_EARLY_BETA_SOFTWARE_WR");
+                                "FEATURE_ROLLOUT_NIGHTLY_SOFTWARE_WR_S_M_SCRN");
 #  endif
 #endif
   }