Backed out changeset 1bf5a1f1db9a (bug 1686946) for causing bc failures in browser_policy_hardware_acceleration.js
authorMihai Alexandru Michis <malexandru@mozilla.com>
Wed, 10 Feb 2021 19:46:27 +0200
changeset 566849 93184b7fe095d0e77615e70a9c7e96592b5fb293
parent 566848 7d089aec8ffc916de4961193bf33c67f4a36aebf
child 566850 e5ed9b01c18167aae0c2813b8b19a21596769fa5
push id38191
push userbtara@mozilla.com
push dateThu, 11 Feb 2021 05:02:45 +0000
treeherdermozilla-central@5cbcb80f72bd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1686946
milestone87.0a1
backs out1bf5a1f1db9a71a50c1d02a1b8e51a3016bb002e
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
Backed out changeset 1bf5a1f1db9a (bug 1686946) for causing bc failures in browser_policy_hardware_acceleration.js CLOSED TREE
gfx/webrender_bindings/RenderCompositor.cpp
widget/cocoa/GfxInfo.mm
--- a/gfx/webrender_bindings/RenderCompositor.cpp
+++ b/gfx/webrender_bindings/RenderCompositor.cpp
@@ -2,17 +2,16 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "RenderCompositor.h"
 
 #include "gfxConfig.h"
-#include "gfxPlatform.h"
 #include "GLContext.h"
 #include "mozilla/StaticPrefs_gfx.h"
 #include "mozilla/gfx/Logging.h"
 #include "mozilla/gfx/gfxVars.h"
 #include "mozilla/layers/SyncObject.h"
 #include "mozilla/webrender/RenderCompositorOGL.h"
 #include "mozilla/webrender/RenderCompositorSWGL.h"
 #include "mozilla/widget/CompositorWidget.h"
@@ -147,19 +146,17 @@ void wr_partial_present_compositor_set_b
 }
 
 /* static */
 UniquePtr<RenderCompositor> RenderCompositor::Create(
     RefPtr<widget::CompositorWidget>&& aWidget, nsACString& aError) {
   if (gfx::gfxVars::UseSoftwareWebRender()) {
 #ifdef XP_MACOSX
     // Mac uses NativeLayerCA
-    if (!gfxPlatform::IsHeadless()) {
-      return RenderCompositorNativeSWGL::Create(std::move(aWidget), aError);
-    }
+    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()) {
       UniquePtr<RenderCompositor> comp =
           RenderCompositorD3D11SWGL::Create(std::move(aWidget), aError);
       if (comp) {
         return comp;
--- a/widget/cocoa/GfxInfo.mm
+++ b/widget/cocoa/GfxInfo.mm
@@ -452,26 +452,16 @@ const nsTArray<GfxDriverInfo>& GfxInfo::
                                    nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
                                    "FEATURE_ROLLOUT_AMD_MAC");
     IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX, DeviceFamily::NvidiaRolloutWebRender,
                                    nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
                                    "FEATURE_ROLLOUT_NVIDIA_MAC");
     IMPLEMENT_MAC_DRIVER_BLOCKLIST(OperatingSystem::OSX, DeviceFamily::AppleAll,
                                    nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS,
                                    "FEATURE_ROLLOUT_APPLE_SILICON_MAC");
-
-    // FEATURE_WEBRENDER_SOFTWARE - ALLOWLIST
-#ifdef EARLY_BETA_OR_EARLIER
-#  if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || \
-      defined(__amd64__)
-    IMPLEMENT_MAC_DRIVER_BLOCKLIST(
-        OperatingSystem::OSX, DeviceFamily::All, nsIGfxInfo::FEATURE_WEBRENDER_SOFTWARE,
-        nsIGfxInfo::FEATURE_ALLOW_ALWAYS, "FEATURE_ROLLOUT_EARLY_BETA_SOFTWARE_WR");
-#  endif
-#endif
   }
   return *sDriverInfo;
 }
 
 nsresult GfxInfo::GetFeatureStatusImpl(int32_t aFeature, int32_t* aStatus,
                                        nsAString& aSuggestedDriverVersion,
                                        const nsTArray<GfxDriverInfo>& aDriverInfo,
                                        nsACString& aFailureId,