Add high-res tiling support to Advanced Layers. (bug 1420674 part 5, r=mattwoodrow)

--HG--
extra : rebase_source : b5448c63830ce9e09c0602262f7664ce363e53c0

gfx/layers/composite/TiledContentHost.cpp

@@ -48,6 +48,26 @@ TileHost::GetFadeInOpacity(float aOpacity)
   return aOpacity * (elapsed / duration);
 }
 
+RefPtr<TextureSource>
+TileHost::AcquireTextureSource() const
+{
+  if (!mTextureHost || !mTextureHost->AcquireTextureSource(mTextureSource)) {
+    return nullptr;
+  }
+  return mTextureSource.get();
+}
+
+RefPtr<TextureSource>
+TileHost::AcquireTextureSourceOnWhite() const
+{
+  if (!mTextureHostOnWhite ||
+      !mTextureHostOnWhite->AcquireTextureSource(mTextureSourceOnWhite))
+  {
+    return nullptr;
+  }
+  return mTextureSourceOnWhite.get();
+}
+
 TiledLayerBufferComposite::TiledLayerBufferComposite()
   : mFrameResolution()
 {}

gfx/layers/composite/TiledContentHost.h

@@ -99,6 +99,9 @@ public:
     CompositableHost::DumpTextureHost(aStream, mTextureHost);
   }
 
+  RefPtr<TextureSource> AcquireTextureSource() const;
+  RefPtr<TextureSource> AcquireTextureSourceOnWhite() const;
+
   /**
    * This does a linear tween of the passed opacity (which is assumed
    * to be between 0.0 and 1.0). The duration of the fade is controlled
@@ -234,6 +237,13 @@ public:
 
   virtual void AddAnimationInvalidation(nsIntRegion& aRegion) override;
 
+  TiledLayerBufferComposite& GetLowResBuffer() {
+    return mLowPrecisionTiledBuffer;
+  }
+  TiledLayerBufferComposite& GetHighResBuffer() {
+    return mTiledBuffer;
+  }
+
 private:
 
   void RenderLayerBuffer(TiledLayerBufferComposite& aLayerBuffer,

gfx/layers/mlgpu/MLGDevice.cpp

@@ -11,8 +11,10 @@
 #include "gfxConfig.h"
 #include "gfxPrefs.h"
 #include "gfxUtils.h"
+#include "LayersLogging.h"
 #include "ShaderDefinitionsMLGPU.h"
 #include "SharedBufferMLGPU.h"
+#include "UtilityMLGPU.h"
 
 namespace mozilla {
 namespace layers {

gfx/layers/mlgpu/PaintedLayerMLGPU.cpp

@@ -7,6 +7,7 @@
 #include "PaintedLayerMLGPU.h"
 #include "LayerManagerMLGPU.h"
 #include "mozilla/layers/LayersHelpers.h"
+#include "mozilla/layers/TiledContentHost.h"
 #include "UnitTransforms.h"
 
 namespace mozilla {
@@ -103,7 +104,9 @@ PaintedLayerMLGPU::AssignToView(FrameBuilder* aBuilder,
                                 Maybe<Polygon>&& aGeometry)
 {
   if (TiledContentHost* tiles = mHost->AsTiledContentHost()) {
-    // Not yet implemented.
+    // Note: we do not support the low-res buffer yet.
+    MOZ_ASSERT(tiles->GetLowResBuffer().GetTileCount() == 0);
+    AssignHighResTilesToView(aBuilder, aView, tiles, aGeometry);
     return;
   }
 
@@ -126,6 +129,86 @@ PaintedLayerMLGPU::AssignToView(FrameBuilder* aBuilder,
   LayerMLGPU::AssignToView(aBuilder, aView, Move(aGeometry));
 }
 
+void
+PaintedLayerMLGPU::AssignHighResTilesToView(FrameBuilder* aBuilder,
+                                            RenderViewMLGPU* aView,
+                                            TiledContentHost* aTileHost,
+                                            const Maybe<Polygon>& aGeometry)
+{
+  TiledLayerBufferComposite& tiles = aTileHost->GetHighResBuffer();
+
+  LayerIntRegion compositeRegion = ViewAs<LayerPixel>(tiles.GetValidRegion());
+  compositeRegion.AndWith(GetShadowVisibleRegion());
+  if (compositeRegion.IsEmpty()) {
+    return;
+  }
+
+  AssignTileBufferToView(aBuilder, aView, tiles, compositeRegion, aGeometry);
+}
+
+void
+PaintedLayerMLGPU::AssignTileBufferToView(FrameBuilder* aBuilder,
+                                          RenderViewMLGPU* aView,
+                                          TiledLayerBufferComposite& aTiles,
+                                          const LayerIntRegion& aCompositeRegion,
+                                          const Maybe<Polygon>& aGeometry)
+{
+  float resolution = aTiles.GetResolution();
+
+  // Save these so they can be restored at the end.
+  float baseOpacity = mComputedOpacity;
+  LayerIntRegion visible = GetShadowVisibleRegion();
+
+  for (size_t i = 0; i < aTiles.GetTileCount(); i++) {
+    TileHost& tile = aTiles.GetTile(i);
+    if (tile.IsPlaceholderTile()) {
+      continue;
+    }
+
+    TileIntPoint pos =  aTiles.GetPlacement().TilePosition(i);
+    // A sanity check that catches a lot of mistakes.
+    MOZ_ASSERT(pos.x == tile.mTilePosition.x && pos.y == tile.mTilePosition.y);
+
+    IntPoint offset = aTiles.GetTileOffset(pos);
+
+    // Use LayerIntRect here so we don't have to keep re-allocating the region
+    // to change the unit type.
+    LayerIntRect tileRect(ViewAs<LayerPixel>(offset),
+                          ViewAs<LayerPixel>(aTiles.GetScaledTileSize()));
+    LayerIntRegion tileDrawRegion = tileRect;
+    tileDrawRegion.AndWith(aCompositeRegion);
+    if (tileDrawRegion.IsEmpty()) {
+      continue;
+    }
+    tileDrawRegion.ScaleRoundOut(resolution, resolution);
+
+    // Update layer state for this tile - that includes the texture, visible
+    // region, and opacity.
+    mTexture = tile.AcquireTextureSource();
+    if (!mTexture) {
+      continue;
+    }
+
+    mTextureOnWhite = tile.AcquireTextureSourceOnWhite();
+
+    SetShadowVisibleRegion(tileDrawRegion);
+    mComputedOpacity = tile.GetFadeInOpacity(baseOpacity);
+    mDestOrigin = offset;
+
+    // Yes, it's a bit weird that we're assigning the same layer to the same
+    // view multiple times. Note that each time, the texture, computed
+    // opacity, origin, and visible region are updated to match the current
+    // tile, and we restore these properties after we've finished processing
+    // all tiles.
+    Maybe<Polygon> geometry = aGeometry;
+    LayerMLGPU::AssignToView(aBuilder, aView, Move(geometry));
+  }
+
+  // Restore the computed opacity and visible region.
+  mComputedOpacity = baseOpacity;
+  SetShadowVisibleRegion(Move(visible));
+}
+
 void
 PaintedLayerMLGPU::CleanupResources()
 {

gfx/layers/mlgpu/PaintedLayerMLGPU.h

@@ -16,6 +16,8 @@
 namespace mozilla {
 namespace layers {
 
+class TiledLayerBufferComposite;
+
 class PaintedLayerMLGPU final
   : public PaintedLayer,
     public LayerMLGPU
@@ -77,7 +79,19 @@ protected:
   // We override this to support tiling.
   void AssignToView(FrameBuilder* aBuilder,
                     RenderViewMLGPU* aView,
-                    Maybe<Polygon>&& aGeometry) override;
+                    Maybe<gfx::Polygon>&& aGeometry) override;
+
+  void AssignHighResTilesToView(FrameBuilder* aBuilder,
+                                RenderViewMLGPU* aView,
+                                TiledContentHost* aTileHost,
+                                const Maybe<gfx::Polygon>& aGeometry);
+
+  // Helper for Assign*TilesToView.
+  void AssignTileBufferToView(FrameBuilder* aBuilder,
+                              RenderViewMLGPU* aView,
+                              TiledLayerBufferComposite& aTiles,
+                              const LayerIntRegion& aCompositeRegion,
+                              const Maybe<gfx::Polygon>& aGeometry);
 
   void CleanupResources();
 
@@ -88,7 +102,7 @@ private:
 #ifndef MOZ_IGNORE_PAINT_WILL_RESAMPLE
   LayerIntRegion mDrawRects;
 #endif
-  IntPoint mDestOrigin;
+  gfx::IntPoint mDestOrigin;
 };
 
 } // namespace layers