Bug 1541472 - Remove Advanced Layers, since it's disabled everywhere …

…now. r=jrmuizel Differential Revision: https://phabricator.services.mozilla.com/D104592
Brli · Feb 10, 2021 · ea78339 · ea78339
1 parent 786a565
commit ea78339
Show file tree

Hide file tree

Showing 70 changed files with 31 additions and 11,293 deletions.
diff --git a/dom/media/ipc/RDDParent.cpp b/dom/media/ipc/RDDParent.cpp
@@ -198,7 +198,6 @@ mozilla::ipc::IPCResult RDDParent::RecvInitVideoBridge(
           Feature::HW_COMPOSITING,
           Feature::D3D11_COMPOSITING,
           Feature::OPENGL_COMPOSITING,
-          Feature::ADVANCED_LAYERS,
           Feature::DIRECT2D,
           Feature::WEBGPU,
       },

diff --git a/gfx/config/gfxConfig.cpp b/gfx/config/gfxConfig.cpp
@@ -167,9 +167,6 @@ void gfxConfig::Inherit(EnumSet<Feature> aFeatures,
       case Feature::OPENGL_COMPOSITING:
         status = aDevicePrefs.oglCompositing();
         break;
-      case Feature::ADVANCED_LAYERS:
-        status = aDevicePrefs.advancedLayers();
-        break;
       case Feature::DIRECT2D:
         status = aDevicePrefs.useD2D1();
         break;

diff --git a/gfx/config/gfxFeature.h b/gfx/config/gfxFeature.h
@@ -33,7 +33,6 @@ namespace gfx {
   _(WEBRENDER_DCOMP_PRESENT, Feature, "WebRender DirectComposition") \
   _(WEBRENDER_SOFTWARE, Feature, "WebRender software fallback")      \
   _(OMTP, Feature, "Off Main Thread Painting")                       \
-  _(ADVANCED_LAYERS, Feature, "Advanced Layers")                     \
   _(WEBGPU, Feature, "WebGPU")                                       \
   /* Add new entries above this comment */
 

diff --git a/gfx/docs/AdvancedLayers.rst b/gfx/docs/AdvancedLayers.rst
diff --git a/gfx/ipc/GPUChild.cpp b/gfx/ipc/GPUChild.cpp
@@ -56,7 +56,6 @@ void GPUChild::Init() {
       gfxConfig::GetValue(Feature::D3D11_COMPOSITING);
   devicePrefs.oglCompositing() =
       gfxConfig::GetValue(Feature::OPENGL_COMPOSITING);
-  devicePrefs.advancedLayers() = gfxConfig::GetValue(Feature::ADVANCED_LAYERS);
   devicePrefs.useD2D1() = gfxConfig::GetValue(Feature::DIRECT2D);
   devicePrefs.webGPU() = gfxConfig::GetValue(Feature::WEBGPU);
   devicePrefs.d3d11HwAngle() = gfxConfig::GetValue(Feature::D3D11_HW_ANGLE);

diff --git a/gfx/ipc/GPUParent.cpp b/gfx/ipc/GPUParent.cpp
@@ -46,7 +46,6 @@
 #include "mozilla/layers/CompositorThread.h"
 #include "mozilla/layers/ImageBridgeParent.h"
 #include "mozilla/layers/LayerTreeOwnerTracker.h"
-#include "mozilla/layers/MemoryReportingMLGPU.h"
 #include "mozilla/layers/UiCompositorControllerParent.h"
 #include "mozilla/layers/VideoBridgeParent.h"
 #include "mozilla/webrender/RenderThread.h"
@@ -136,7 +135,6 @@ bool GPUParent::Init(base::ProcessId aParentPid, const char* aParentBuildID,
   gfxPlatform::InitNullMetadata();
   // Ensure our Factory is initialised, mainly for gfx logging to work.
   gfxPlatform::InitMoz2DLogging();
-  mlg::InitializeMemoryReporters();
 #if defined(XP_WIN)
   gfxWindowsPlatform::InitMemoryReportersForGPUProcess();
   DeviceManagerDx::Init();
@@ -194,7 +192,6 @@ mozilla::ipc::IPCResult GPUParent::RecvInit(
   gfxConfig::Inherit(Feature::D3D11_COMPOSITING,
                      devicePrefs.d3d11Compositing());
   gfxConfig::Inherit(Feature::OPENGL_COMPOSITING, devicePrefs.oglCompositing());
-  gfxConfig::Inherit(Feature::ADVANCED_LAYERS, devicePrefs.advancedLayers());
   gfxConfig::Inherit(Feature::DIRECT2D, devicePrefs.useD2D1());
   gfxConfig::Inherit(Feature::WEBGPU, devicePrefs.webGPU());
   gfxConfig::Inherit(Feature::D3D11_HW_ANGLE, devicePrefs.d3d11HwAngle());
@@ -426,7 +423,6 @@ static void CopyFeatureChange(Feature aFeature, Maybe<FeatureFailure>* aOut) {
 mozilla::ipc::IPCResult GPUParent::RecvGetDeviceStatus(GPUDeviceData* aOut) {
   CopyFeatureChange(Feature::D3D11_COMPOSITING, &aOut->d3d11Compositing());
   CopyFeatureChange(Feature::OPENGL_COMPOSITING, &aOut->oglCompositing());
-  CopyFeatureChange(Feature::ADVANCED_LAYERS, &aOut->advancedLayers());
 
 #if defined(XP_WIN)
   if (DeviceManagerDx* dm = DeviceManagerDx::Get()) {

diff --git a/gfx/ipc/GraphicsMessages.ipdlh b/gfx/ipc/GraphicsMessages.ipdlh
@@ -32,7 +32,6 @@ struct DevicePrefs
   FeatureStatus hwCompositing;
   FeatureStatus d3d11Compositing;
   FeatureStatus oglCompositing;
-  FeatureStatus advancedLayers;
   FeatureStatus useD2D1;
   FeatureStatus webGPU;
   FeatureStatus d3d11HwAngle;
@@ -59,7 +58,6 @@ struct GPUDeviceData
   // null.
   FeatureFailure? d3d11Compositing;
   FeatureFailure? oglCompositing;
-  FeatureFailure? advancedLayers;
   D3D11DeviceStatus? gpuDevice;
   FeatureFailure? webGPU;
 };

diff --git a/gfx/layers/composite/LayerManagerComposite.h b/gfx/layers/composite/LayerManagerComposite.h
@@ -72,8 +72,6 @@ class TextureSourceProvider;
 class CompositingRenderTarget;
 struct FPSState;
 class PaintCounter;
-class LayerMLGPU;
-class LayerManagerMLGPU;
 class UiCompositorControllerParent;
 class Layer;
 struct LayerProperties;
@@ -126,7 +124,6 @@ class HostLayerManager : public LayerManager {
   virtual void InvalidateAll() = 0;
 
   HostLayerManager* AsHostLayerManager() override { return this; }
-  virtual LayerManagerMLGPU* AsLayerManagerMLGPU() { return nullptr; }
 
   void ExtractImageCompositeNotifications(
       nsTArray<ImageCompositeNotificationInfo>* aNotifications) {
@@ -551,8 +548,6 @@ class HostLayer {
 
   virtual Layer* GetLayer() = 0;
 
-  virtual LayerMLGPU* AsLayerMLGPU() { return nullptr; }
-
   virtual bool SetCompositableHost(CompositableHost*) {
     // We must handle this gracefully, see bug 967824
     NS_WARNING(