2019-08-16 04:30:02 +03:00
|
|
|
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nullptr; c-basic-offset: 2 -*-
|
|
|
|
* 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/. */
|
|
|
|
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
#include "mozilla/layers/NativeLayerCA.h"
|
2019-08-16 04:30:02 +03:00
|
|
|
|
2019-12-29 15:18:32 +03:00
|
|
|
#import <AppKit/NSAnimationContext.h>
|
2019-11-25 22:06:16 +03:00
|
|
|
#import <AppKit/NSColor.h>
|
2019-12-29 15:18:32 +03:00
|
|
|
#import <QuartzCore/QuartzCore.h>
|
2019-08-16 04:30:02 +03:00
|
|
|
|
|
|
|
#include <utility>
|
|
|
|
#include <algorithm>
|
|
|
|
|
2019-11-19 06:11:13 +03:00
|
|
|
#include "GLBlitHelper.h"
|
2019-09-02 01:35:56 +03:00
|
|
|
#include "GLContextCGL.h"
|
|
|
|
#include "MozFramebuffer.h"
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
#include "mozilla/layers/SurfacePoolCA.h"
|
2019-09-02 01:35:56 +03:00
|
|
|
#include "ScopedGLHelpers.h"
|
|
|
|
|
2019-08-20 01:54:26 +03:00
|
|
|
@interface CALayer (PrivateSetContentsOpaque)
|
|
|
|
- (void)setContentsOpaque:(BOOL)opaque;
|
|
|
|
@end
|
|
|
|
|
2019-08-16 04:30:02 +03:00
|
|
|
namespace mozilla {
|
|
|
|
namespace layers {
|
|
|
|
|
|
|
|
using gfx::IntPoint;
|
|
|
|
using gfx::IntSize;
|
|
|
|
using gfx::IntRect;
|
|
|
|
using gfx::IntRegion;
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
using gl::GLContext;
|
|
|
|
using gl::GLContextCGL;
|
2019-08-16 04:30:02 +03:00
|
|
|
|
2019-12-29 15:18:56 +03:00
|
|
|
// Needs to be on the stack whenever CALayer mutations are performed.
|
|
|
|
// (Mutating CALayers outside of a transaction can result in permanently stuck rendering, because
|
|
|
|
// such mutations create an implicit transaction which never auto-commits if the current thread does
|
|
|
|
// not have a native runloop.)
|
|
|
|
// Uses NSAnimationContext, which wraps CATransaction with additional off-main-thread protection,
|
|
|
|
// see bug 1585523.
|
|
|
|
struct MOZ_STACK_CLASS AutoCATransaction final {
|
|
|
|
AutoCATransaction() {
|
|
|
|
[NSAnimationContext beginGrouping];
|
|
|
|
// By default, mutating a CALayer property triggers an animation which smoothly transitions the
|
|
|
|
// property to the new value. We don't need these animations, and this call turns them off:
|
|
|
|
[CATransaction setDisableActions:YES];
|
|
|
|
}
|
|
|
|
~AutoCATransaction() { [NSAnimationContext endGrouping]; }
|
|
|
|
};
|
|
|
|
|
2019-08-16 04:30:02 +03:00
|
|
|
/* static */ already_AddRefed<NativeLayerRootCA> NativeLayerRootCA::CreateForCALayer(
|
|
|
|
CALayer* aLayer) {
|
|
|
|
RefPtr<NativeLayerRootCA> layerRoot = new NativeLayerRootCA(aLayer);
|
|
|
|
return layerRoot.forget();
|
|
|
|
}
|
|
|
|
|
2019-12-29 15:20:09 +03:00
|
|
|
// Returns an autoreleased CALayer* object.
|
|
|
|
static CALayer* MakeOffscreenRootCALayer() {
|
|
|
|
// This layer should behave similarly to the backing layer of a flipped NSView.
|
|
|
|
// It will never be rendered on the screen and it will never be attached to an NSView's layer;
|
|
|
|
// instead, it will be the root layer of a "local" CAContext.
|
|
|
|
// Setting geometryFlipped to YES causes the orientation of descendant CALayers' contents (such as
|
|
|
|
// IOSurfaces) to be consistent with what happens in a layer subtree that is attached to a flipped
|
|
|
|
// NSView. Setting it to NO would cause the surfaces in individual leaf layers to render upside
|
|
|
|
// down (rather than just flipping the entire layer tree upside down).
|
|
|
|
AutoCATransaction transaction;
|
|
|
|
CALayer* layer = [CALayer layer];
|
|
|
|
layer.position = NSZeroPoint;
|
|
|
|
layer.bounds = NSZeroRect;
|
|
|
|
layer.anchorPoint = NSZeroPoint;
|
|
|
|
layer.contentsGravity = kCAGravityTopLeft;
|
|
|
|
layer.masksToBounds = YES;
|
|
|
|
layer.geometryFlipped = YES;
|
|
|
|
return layer;
|
|
|
|
}
|
|
|
|
|
2019-08-16 04:30:02 +03:00
|
|
|
NativeLayerRootCA::NativeLayerRootCA(CALayer* aLayer)
|
2019-12-29 15:20:09 +03:00
|
|
|
: mMutex("NativeLayerRootCA"),
|
|
|
|
mOnscreenRepresentation(aLayer),
|
|
|
|
mOffscreenRepresentation(MakeOffscreenRootCALayer()) {}
|
2019-08-16 04:30:02 +03:00
|
|
|
|
|
|
|
NativeLayerRootCA::~NativeLayerRootCA() {
|
|
|
|
MOZ_RELEASE_ASSERT(mSublayers.IsEmpty(),
|
|
|
|
"Please clear all layers before destroying the layer root.");
|
|
|
|
}
|
|
|
|
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
already_AddRefed<NativeLayer> NativeLayerRootCA::CreateLayer(
|
|
|
|
const IntSize& aSize, bool aIsOpaque, SurfacePoolHandle* aSurfacePoolHandle) {
|
|
|
|
RefPtr<NativeLayer> layer =
|
|
|
|
new NativeLayerCA(aSize, aIsOpaque, aSurfacePoolHandle->AsSurfacePoolHandleCA());
|
2019-08-16 04:30:02 +03:00
|
|
|
return layer.forget();
|
|
|
|
}
|
|
|
|
|
|
|
|
void NativeLayerRootCA::AppendLayer(NativeLayer* aLayer) {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
RefPtr<NativeLayerCA> layerCA = aLayer->AsNativeLayerCA();
|
|
|
|
MOZ_RELEASE_ASSERT(layerCA);
|
|
|
|
|
|
|
|
mSublayers.AppendElement(layerCA);
|
|
|
|
layerCA->SetBackingScale(mBackingScale);
|
2019-12-29 15:20:09 +03:00
|
|
|
ForAllRepresentations([&](Representation& r) { r.mMutated = true; });
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void NativeLayerRootCA::RemoveLayer(NativeLayer* aLayer) {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
RefPtr<NativeLayerCA> layerCA = aLayer->AsNativeLayerCA();
|
|
|
|
MOZ_RELEASE_ASSERT(layerCA);
|
|
|
|
|
|
|
|
mSublayers.RemoveElement(layerCA);
|
2019-12-29 15:20:09 +03:00
|
|
|
ForAllRepresentations([&](Representation& r) { r.mMutated = true; });
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
2019-10-29 23:31:44 +03:00
|
|
|
void NativeLayerRootCA::SetLayers(const nsTArray<RefPtr<NativeLayer>>& aLayers) {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
// Ideally, we'd just be able to do mSublayers = std::move(aLayers).
|
|
|
|
// However, aLayers has a different type: it carries NativeLayer objects, whereas mSublayers
|
|
|
|
// carries NativeLayerCA objects, so we have to downcast all the elements first. There's one other
|
|
|
|
// reason to look at all the elements in aLayers first: We need to make sure any new layers know
|
|
|
|
// about our current backing scale.
|
|
|
|
|
|
|
|
nsTArray<RefPtr<NativeLayerCA>> layersCA(aLayers.Length());
|
|
|
|
for (auto& layer : aLayers) {
|
|
|
|
RefPtr<NativeLayerCA> layerCA = layer->AsNativeLayerCA();
|
|
|
|
MOZ_RELEASE_ASSERT(layerCA);
|
|
|
|
layerCA->SetBackingScale(mBackingScale);
|
|
|
|
layersCA.AppendElement(std::move(layerCA));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (layersCA != mSublayers) {
|
|
|
|
mSublayers = std::move(layersCA);
|
2019-12-29 15:20:09 +03:00
|
|
|
ForAllRepresentations([&](Representation& r) { r.mMutated = true; });
|
2019-10-29 23:31:44 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-29 15:18:30 +03:00
|
|
|
void NativeLayerRootCA::SetBackingScale(float aBackingScale) {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
mBackingScale = aBackingScale;
|
|
|
|
for (auto layer : mSublayers) {
|
|
|
|
layer->SetBackingScale(aBackingScale);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
float NativeLayerRootCA::BackingScale() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
return mBackingScale;
|
|
|
|
}
|
|
|
|
|
2019-12-29 15:18:32 +03:00
|
|
|
void NativeLayerRootCA::SuspendOffMainThreadCommits() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
mOffMainThreadCommitsSuspended = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool NativeLayerRootCA::UnsuspendOffMainThreadCommits() {
|
2019-08-16 04:30:02 +03:00
|
|
|
MutexAutoLock lock(mMutex);
|
2019-12-29 15:18:32 +03:00
|
|
|
mOffMainThreadCommitsSuspended = false;
|
|
|
|
return mCommitPending;
|
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
|
2019-12-29 15:18:32 +03:00
|
|
|
bool NativeLayerRootCA::AreOffMainThreadCommitsSuspended() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
return mOffMainThreadCommitsSuspended;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool NativeLayerRootCA::CommitToScreen() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
if (!NS_IsMainThread() && mOffMainThreadCommitsSuspended) {
|
|
|
|
mCommitPending = true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2019-12-29 15:20:09 +03:00
|
|
|
mOnscreenRepresentation.Commit(WhichRepresentation::ONSCREEN, mSublayers);
|
|
|
|
|
|
|
|
mCommitPending = false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename F>
|
|
|
|
void NativeLayerRootCA::ForAllRepresentations(F aFn) {
|
|
|
|
aFn(mOnscreenRepresentation);
|
|
|
|
aFn(mOffscreenRepresentation);
|
|
|
|
}
|
|
|
|
|
|
|
|
NativeLayerRootCA::Representation::Representation(CALayer* aRootCALayer)
|
|
|
|
: mRootCALayer([aRootCALayer retain]) {}
|
|
|
|
|
|
|
|
NativeLayerRootCA::Representation::~Representation() {
|
|
|
|
if (mMutated) {
|
|
|
|
// Clear the root layer's sublayers. At this point the window is usually closed, so this
|
|
|
|
// transaction does not cause any screen updates.
|
|
|
|
AutoCATransaction transaction;
|
|
|
|
mRootCALayer.sublayers = @[];
|
|
|
|
}
|
|
|
|
|
|
|
|
[mRootCALayer release];
|
|
|
|
}
|
|
|
|
|
|
|
|
void NativeLayerRootCA::Representation::Commit(WhichRepresentation aRepresentation,
|
|
|
|
const nsTArray<RefPtr<NativeLayerCA>>& aSublayers) {
|
2019-12-29 15:18:56 +03:00
|
|
|
AutoCATransaction transaction;
|
2019-08-16 04:30:02 +03:00
|
|
|
|
|
|
|
// Call ApplyChanges on our sublayers first, and then update the root layer's
|
|
|
|
// list of sublayers. The order is important because we need layer->UnderlyingCALayer()
|
|
|
|
// to be non-null, and the underlying CALayer gets lazily initialized in ApplyChanges().
|
2019-12-29 15:20:09 +03:00
|
|
|
for (auto layer : aSublayers) {
|
|
|
|
layer->ApplyChanges(aRepresentation);
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (mMutated) {
|
2019-12-29 15:20:09 +03:00
|
|
|
NSMutableArray<CALayer*>* sublayers = [NSMutableArray arrayWithCapacity:aSublayers.Length()];
|
|
|
|
for (auto layer : aSublayers) {
|
|
|
|
[sublayers addObject:layer->UnderlyingCALayer(aRepresentation)];
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
mRootCALayer.sublayers = sublayers;
|
|
|
|
mMutated = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
NativeLayerCA::NativeLayerCA(const IntSize& aSize, bool aIsOpaque,
|
|
|
|
SurfacePoolHandleCA* aSurfacePoolHandle)
|
|
|
|
: mMutex("NativeLayerCA"),
|
|
|
|
mSurfacePoolHandle(aSurfacePoolHandle),
|
|
|
|
mSize(aSize),
|
|
|
|
mIsOpaque(aIsOpaque) {
|
|
|
|
MOZ_RELEASE_ASSERT(mSurfacePoolHandle, "Need a non-null surface pool handle.");
|
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
|
|
|
|
NativeLayerCA::~NativeLayerCA() {
|
2019-09-02 02:22:04 +03:00
|
|
|
if (mInProgressLockedIOSurface) {
|
|
|
|
mInProgressLockedIOSurface->Unlock(false);
|
|
|
|
mInProgressLockedIOSurface = nullptr;
|
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
if (mInProgressSurface) {
|
|
|
|
IOSurfaceDecrementUseCount(mInProgressSurface->mSurface.get());
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
mSurfacePoolHandle->ReturnSurfaceToPool(mInProgressSurface->mSurface);
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
if (mFrontSurface) {
|
|
|
|
mSurfacePoolHandle->ReturnSurfaceToPool(mFrontSurface->mSurface);
|
|
|
|
}
|
|
|
|
for (const auto& surf : mSurfaces) {
|
2019-12-18 23:34:43 +03:00
|
|
|
mSurfacePoolHandle->ReturnSurfaceToPool(surf.mEntry.mSurface);
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void NativeLayerCA::SetSurfaceIsFlipped(bool aIsFlipped) {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
2019-08-20 01:54:26 +03:00
|
|
|
if (aIsFlipped != mSurfaceIsFlipped) {
|
|
|
|
mSurfaceIsFlipped = aIsFlipped;
|
2019-12-29 15:20:09 +03:00
|
|
|
ForAllRepresentations([&](Representation& r) { r.mMutatedSurfaceIsFlipped = true; });
|
2019-08-20 01:54:26 +03:00
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
bool NativeLayerCA::SurfaceIsFlipped() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
return mSurfaceIsFlipped;
|
|
|
|
}
|
|
|
|
|
2019-11-13 21:46:02 +03:00
|
|
|
IntSize NativeLayerCA::GetSize() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
return mSize;
|
|
|
|
}
|
2019-12-29 15:19:51 +03:00
|
|
|
|
2019-11-13 21:46:02 +03:00
|
|
|
void NativeLayerCA::SetPosition(const IntPoint& aPosition) {
|
2019-08-16 04:30:02 +03:00
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
2019-11-13 21:46:02 +03:00
|
|
|
if (aPosition != mPosition) {
|
|
|
|
mPosition = aPosition;
|
2019-12-29 15:20:09 +03:00
|
|
|
ForAllRepresentations([&](Representation& r) { r.mMutatedPosition = true; });
|
2019-08-20 01:54:26 +03:00
|
|
|
}
|
2019-11-13 21:46:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
IntPoint NativeLayerCA::GetPosition() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
return mPosition;
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
IntRect NativeLayerCA::GetRect() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
2019-08-20 01:54:26 +03:00
|
|
|
return IntRect(mPosition, mSize);
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void NativeLayerCA::SetBackingScale(float aBackingScale) {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
2019-08-20 01:54:26 +03:00
|
|
|
if (aBackingScale != mBackingScale) {
|
|
|
|
mBackingScale = aBackingScale;
|
2019-12-29 15:20:09 +03:00
|
|
|
ForAllRepresentations([&](Representation& r) { r.mMutatedBackingScale = true; });
|
2019-08-20 01:54:26 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-29 22:24:24 +03:00
|
|
|
bool NativeLayerCA::IsOpaque() {
|
2019-08-20 01:54:26 +03:00
|
|
|
MutexAutoLock lock(mMutex);
|
2019-10-29 22:24:24 +03:00
|
|
|
return mIsOpaque;
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
2019-10-29 22:25:27 +03:00
|
|
|
void NativeLayerCA::SetClipRect(const Maybe<gfx::IntRect>& aClipRect) {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
if (aClipRect != mClipRect) {
|
|
|
|
mClipRect = aClipRect;
|
2019-12-29 15:20:09 +03:00
|
|
|
ForAllRepresentations([&](Representation& r) { r.mMutatedClipRect = true; });
|
2019-10-29 22:25:27 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Maybe<gfx::IntRect> NativeLayerCA::ClipRect() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
return mClipRect;
|
|
|
|
}
|
|
|
|
|
2019-12-29 15:19:51 +03:00
|
|
|
NativeLayerCA::Representation::~Representation() {
|
|
|
|
[mContentCALayer release];
|
|
|
|
[mOpaquenessTintLayer release];
|
|
|
|
[mWrappingCALayer release];
|
|
|
|
}
|
|
|
|
|
2019-11-13 21:55:18 +03:00
|
|
|
void NativeLayerCA::InvalidateRegionThroughoutSwapchain(const MutexAutoLock&,
|
|
|
|
const IntRegion& aRegion) {
|
2019-08-16 04:30:02 +03:00
|
|
|
IntRegion r = aRegion;
|
|
|
|
if (mInProgressSurface) {
|
|
|
|
mInProgressSurface->mInvalidRegion.OrWith(r);
|
|
|
|
}
|
2019-11-19 06:10:58 +03:00
|
|
|
if (mFrontSurface) {
|
|
|
|
mFrontSurface->mInvalidRegion.OrWith(r);
|
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
for (auto& surf : mSurfaces) {
|
2019-12-18 23:34:43 +03:00
|
|
|
surf.mEntry.mInvalidRegion.OrWith(r);
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-19 06:11:13 +03:00
|
|
|
bool NativeLayerCA::NextSurface(const MutexAutoLock& aLock) {
|
2019-11-13 21:46:02 +03:00
|
|
|
if (mSize.IsEmpty()) {
|
2019-11-19 06:11:13 +03:00
|
|
|
NSLog(@"NextSurface returning false because of invalid mSize (%d, %d).", mSize.width,
|
2019-11-13 21:46:02 +03:00
|
|
|
mSize.height);
|
2019-11-19 06:11:13 +03:00
|
|
|
return false;
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
MOZ_RELEASE_ASSERT(
|
|
|
|
!mInProgressSurface,
|
|
|
|
"ERROR: Do not call NextSurface twice in sequence. Call NotifySurfaceReady before the "
|
|
|
|
"next call to NextSurface.");
|
|
|
|
|
2019-12-18 23:34:28 +03:00
|
|
|
Maybe<SurfaceWithInvalidRegion> surf = GetUnusedSurfaceAndCleanUp(aLock);
|
|
|
|
if (!surf) {
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
CFTypeRefPtr<IOSurfaceRef> newSurf = mSurfacePoolHandle->ObtainSurfaceFromPool(mSize);
|
2019-08-16 04:30:02 +03:00
|
|
|
if (!newSurf) {
|
2019-11-19 06:11:13 +03:00
|
|
|
NSLog(@"NextSurface returning false because IOSurfaceCreate failed to create the surface.");
|
|
|
|
return false;
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
2019-11-13 21:46:02 +03:00
|
|
|
surf = Some(SurfaceWithInvalidRegion{newSurf, IntRect({}, mSize)});
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
MOZ_RELEASE_ASSERT(surf);
|
|
|
|
mInProgressSurface = std::move(surf);
|
|
|
|
IOSurfaceIncrementUseCount(mInProgressSurface->mSurface.get());
|
2019-11-19 06:11:13 +03:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename F>
|
|
|
|
void NativeLayerCA::HandlePartialUpdate(const MutexAutoLock& aLock,
|
|
|
|
const gfx::IntRegion& aUpdateRegion, F&& aCopyFn) {
|
|
|
|
MOZ_RELEASE_ASSERT(IntRect({}, mSize).Contains(aUpdateRegion.GetBounds()),
|
|
|
|
"The update region should be within the surface bounds.");
|
|
|
|
|
|
|
|
InvalidateRegionThroughoutSwapchain(aLock, aUpdateRegion);
|
|
|
|
|
|
|
|
gfx::IntRegion copyRegion;
|
|
|
|
copyRegion.Sub(mInProgressSurface->mInvalidRegion, aUpdateRegion);
|
|
|
|
if (!copyRegion.IsEmpty()) {
|
|
|
|
// There are parts in mInProgressSurface which are invalid but which are not included in
|
|
|
|
// aUpdateRegion. We will obtain valid content for those parts by copying from a previous
|
|
|
|
// surface.
|
|
|
|
MOZ_RELEASE_ASSERT(
|
2019-12-29 15:19:31 +03:00
|
|
|
mFrontSurface,
|
2019-11-19 06:11:13 +03:00
|
|
|
"The first call to NextSurface* must always update the entire layer. If this "
|
2019-12-29 15:19:31 +03:00
|
|
|
"is the second call, mFrontSurface will be Some().");
|
|
|
|
|
|
|
|
// NotifySurfaceReady marks the entirety of mFrontSurface as valid.
|
|
|
|
MOZ_RELEASE_ASSERT(mFrontSurface->mInvalidRegion.Intersect(copyRegion).IsEmpty(),
|
|
|
|
"mFrontSurface should have valid content in the entire copy region, because "
|
2019-11-19 06:11:13 +03:00
|
|
|
"the only invalidation since NotifySurfaceReady was aUpdateRegion, and "
|
|
|
|
"aUpdateRegion has no overlap with copyRegion.");
|
|
|
|
|
2019-12-29 15:19:31 +03:00
|
|
|
// Now copy the valid content, using a caller-provided copy function.
|
|
|
|
aCopyFn(mFrontSurface->mSurface, copyRegion);
|
2019-11-19 06:11:13 +03:00
|
|
|
mInProgressSurface->mInvalidRegion.SubOut(copyRegion);
|
|
|
|
}
|
|
|
|
|
|
|
|
MOZ_RELEASE_ASSERT(mInProgressSurface->mInvalidRegion == aUpdateRegion);
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
2019-11-13 21:55:18 +03:00
|
|
|
RefPtr<gfx::DrawTarget> NativeLayerCA::NextSurfaceAsDrawTarget(const gfx::IntRegion& aUpdateRegion,
|
|
|
|
gfx::BackendType aBackendType) {
|
2019-09-02 02:22:04 +03:00
|
|
|
MutexAutoLock lock(mMutex);
|
2019-11-19 06:11:13 +03:00
|
|
|
if (!NextSurface(lock)) {
|
2019-09-02 02:22:04 +03:00
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2019-11-19 06:11:13 +03:00
|
|
|
mInProgressLockedIOSurface = new MacIOSurface(mInProgressSurface->mSurface);
|
2019-09-02 02:22:04 +03:00
|
|
|
mInProgressLockedIOSurface->Lock(false);
|
2019-11-19 06:11:13 +03:00
|
|
|
RefPtr<gfx::DrawTarget> dt = mInProgressLockedIOSurface->GetAsDrawTargetLocked(aBackendType);
|
|
|
|
|
|
|
|
HandlePartialUpdate(
|
|
|
|
lock, aUpdateRegion,
|
|
|
|
[&](CFTypeRefPtr<IOSurfaceRef> validSource, const gfx::IntRegion& copyRegion) {
|
|
|
|
RefPtr<MacIOSurface> source = new MacIOSurface(validSource);
|
|
|
|
source->Lock(true);
|
|
|
|
{
|
|
|
|
RefPtr<gfx::DrawTarget> sourceDT = source->GetAsDrawTargetLocked(aBackendType);
|
|
|
|
RefPtr<gfx::SourceSurface> sourceSurface = sourceDT->Snapshot();
|
|
|
|
|
|
|
|
for (auto iter = copyRegion.RectIter(); !iter.Done(); iter.Next()) {
|
|
|
|
const gfx::IntRect& r = iter.Get();
|
|
|
|
dt->CopySurface(sourceSurface, r, r.TopLeft());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
source->Unlock(true);
|
|
|
|
});
|
|
|
|
|
|
|
|
return dt;
|
2019-09-02 02:22:04 +03:00
|
|
|
}
|
|
|
|
|
2019-11-13 21:55:18 +03:00
|
|
|
Maybe<GLuint> NativeLayerCA::NextSurfaceAsFramebuffer(const gfx::IntRegion& aUpdateRegion,
|
|
|
|
bool aNeedsDepth) {
|
2019-09-02 01:35:56 +03:00
|
|
|
MutexAutoLock lock(mMutex);
|
2019-11-19 06:11:13 +03:00
|
|
|
if (!NextSurface(lock)) {
|
2019-09-02 01:35:56 +03:00
|
|
|
return Nothing();
|
|
|
|
}
|
|
|
|
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
Maybe<GLuint> fbo =
|
|
|
|
mSurfacePoolHandle->GetFramebufferForSurface(mInProgressSurface->mSurface, aNeedsDepth);
|
|
|
|
if (!fbo) {
|
|
|
|
return Nothing();
|
|
|
|
}
|
2019-11-19 06:11:13 +03:00
|
|
|
|
|
|
|
HandlePartialUpdate(
|
|
|
|
lock, aUpdateRegion,
|
|
|
|
[&](CFTypeRefPtr<IOSurfaceRef> validSource, const gfx::IntRegion& copyRegion) {
|
|
|
|
// Copy copyRegion from validSource to fbo.
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
MOZ_RELEASE_ASSERT(mSurfacePoolHandle->gl());
|
|
|
|
mSurfacePoolHandle->gl()->MakeCurrent();
|
|
|
|
Maybe<GLuint> sourceFBO = mSurfacePoolHandle->GetFramebufferForSurface(validSource, false);
|
|
|
|
if (!sourceFBO) {
|
|
|
|
return;
|
|
|
|
}
|
2019-11-19 06:11:13 +03:00
|
|
|
for (auto iter = copyRegion.RectIter(); !iter.Done(); iter.Next()) {
|
|
|
|
gfx::IntRect r = iter.Get();
|
|
|
|
if (mSurfaceIsFlipped) {
|
|
|
|
r.y = mSize.height - r.YMost();
|
|
|
|
}
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
mSurfacePoolHandle->gl()->BlitHelper()->BlitFramebufferToFramebuffer(*sourceFBO, *fbo, r,
|
|
|
|
r, LOCAL_GL_NEAREST);
|
2019-11-19 06:11:13 +03:00
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2019-09-02 01:35:56 +03:00
|
|
|
return fbo;
|
|
|
|
}
|
|
|
|
|
2019-08-16 04:30:02 +03:00
|
|
|
void NativeLayerCA::NotifySurfaceReady() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
MOZ_RELEASE_ASSERT(mInProgressSurface,
|
|
|
|
"NotifySurfaceReady called without preceding call to NextSurface");
|
2019-09-02 02:22:04 +03:00
|
|
|
|
|
|
|
if (mInProgressLockedIOSurface) {
|
|
|
|
mInProgressLockedIOSurface->Unlock(false);
|
|
|
|
mInProgressLockedIOSurface = nullptr;
|
|
|
|
}
|
|
|
|
|
2019-12-29 15:19:31 +03:00
|
|
|
if (mFrontSurface) {
|
|
|
|
mSurfaces.push_back({*mFrontSurface, 0});
|
|
|
|
mFrontSurface = Nothing();
|
|
|
|
}
|
|
|
|
|
|
|
|
IOSurfaceDecrementUseCount(mInProgressSurface->mSurface.get());
|
|
|
|
mFrontSurface = std::move(mInProgressSurface);
|
|
|
|
mFrontSurface->mInvalidRegion = IntRect();
|
2019-12-29 15:20:09 +03:00
|
|
|
ForAllRepresentations([&](Representation& r) { r.mMutatedFrontSurface = true; });
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
void NativeLayerCA::DiscardBackbuffers() {
|
|
|
|
MutexAutoLock lock(mMutex);
|
|
|
|
|
|
|
|
for (const auto& surf : mSurfaces) {
|
2019-12-18 23:34:43 +03:00
|
|
|
mSurfacePoolHandle->ReturnSurfaceToPool(surf.mEntry.mSurface);
|
Bug 1592044 - Reduce the frequency of IOSurface and framebuffer creation and destruction with the help of a surface pool. r=jgilbert
There are multiple SurfacePools: Main thread painting and the non-WebRender compositors create a new pool per window, and WebRender creates one shared pool across all windows. The non-WebRender users set the pool size limit to zero, i.e. no recycling across paints. This preserves the pre-existing behavior.
WebRender's pool size is configurable with the gfx.webrender.compositor.surface-pool-size pref.
Every window holds on to a SurfacePoolHandle. A SurfacePoolHandle has an owning reference to the pool, via a surface pool wrapper. Once all handles are gone, the surface pool goes away, too.
The SurfacePool holds on to IOSurfaces and MozFramebuffers. Both are created on demand, independently, but are associated with each other.
A given NativeLayer uses only one surface pool handle during its lifetime. The native layer no longer influences which GLContext its framebuffers are created for; the GL context is now managed by the surface pool handle.
As a result, a NativeLayer can no longer change which GLContext its framebuffers are created by.
So in the future, if we ever need to migrate a window frome one GLContext to another, we will need to recreate the NativeLayers inside it. I think that's ok.
Differential Revision: https://phabricator.services.mozilla.com/D54859
--HG--
extra : moz-landing-system : lando
2019-12-19 00:01:51 +03:00
|
|
|
}
|
|
|
|
mSurfaces.clear();
|
|
|
|
}
|
|
|
|
|
2019-12-29 15:20:09 +03:00
|
|
|
NativeLayerCA::Representation& NativeLayerCA::GetRepresentation(
|
|
|
|
WhichRepresentation aRepresentation) {
|
|
|
|
switch (aRepresentation) {
|
|
|
|
case WhichRepresentation::ONSCREEN:
|
|
|
|
return mOnscreenRepresentation;
|
|
|
|
case WhichRepresentation::OFFSCREEN:
|
|
|
|
return mOffscreenRepresentation;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
template <typename F>
|
|
|
|
void NativeLayerCA::ForAllRepresentations(F aFn) {
|
|
|
|
aFn(mOnscreenRepresentation);
|
|
|
|
aFn(mOffscreenRepresentation);
|
|
|
|
}
|
|
|
|
|
|
|
|
void NativeLayerCA::ApplyChanges(WhichRepresentation aRepresentation) {
|
2019-08-16 04:30:02 +03:00
|
|
|
MutexAutoLock lock(mMutex);
|
2019-12-29 15:20:09 +03:00
|
|
|
GetRepresentation(aRepresentation)
|
|
|
|
.ApplyChanges(mSize, mIsOpaque, mPosition, mClipRect, mBackingScale, mSurfaceIsFlipped,
|
|
|
|
mFrontSurface ? mFrontSurface->mSurface : nullptr);
|
2019-12-29 15:19:51 +03:00
|
|
|
}
|
|
|
|
|
2019-12-29 15:20:09 +03:00
|
|
|
CALayer* NativeLayerCA::UnderlyingCALayer(WhichRepresentation aRepresentation) {
|
2019-12-29 15:19:51 +03:00
|
|
|
MutexAutoLock lock(mMutex);
|
2019-12-29 15:20:09 +03:00
|
|
|
return GetRepresentation(aRepresentation).UnderlyingCALayer();
|
2019-12-29 15:19:51 +03:00
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
|
2019-12-29 15:19:51 +03:00
|
|
|
void NativeLayerCA::Representation::ApplyChanges(const IntSize& aSize, bool aIsOpaque,
|
|
|
|
const IntPoint& aPosition,
|
|
|
|
const Maybe<IntRect>& aClipRect,
|
|
|
|
float aBackingScale, bool aSurfaceIsFlipped,
|
|
|
|
CFTypeRefPtr<IOSurfaceRef> aFrontSurface) {
|
2019-08-20 01:54:26 +03:00
|
|
|
if (!mWrappingCALayer) {
|
|
|
|
mWrappingCALayer = [[CALayer layer] retain];
|
|
|
|
mWrappingCALayer.position = NSZeroPoint;
|
|
|
|
mWrappingCALayer.bounds = NSZeroRect;
|
|
|
|
mWrappingCALayer.anchorPoint = NSZeroPoint;
|
|
|
|
mWrappingCALayer.contentsGravity = kCAGravityTopLeft;
|
2019-10-29 22:24:24 +03:00
|
|
|
mContentCALayer = [[CALayer layer] retain];
|
2019-11-13 21:46:02 +03:00
|
|
|
mContentCALayer.position = NSZeroPoint;
|
2019-10-29 22:24:24 +03:00
|
|
|
mContentCALayer.anchorPoint = NSZeroPoint;
|
|
|
|
mContentCALayer.contentsGravity = kCAGravityTopLeft;
|
2019-11-13 21:46:02 +03:00
|
|
|
mContentCALayer.contentsScale = 1;
|
2019-12-29 15:19:51 +03:00
|
|
|
mContentCALayer.bounds = CGRectMake(0, 0, aSize.width, aSize.height);
|
|
|
|
mContentCALayer.opaque = aIsOpaque;
|
2019-11-13 21:46:02 +03:00
|
|
|
if ([mContentCALayer respondsToSelector:@selector(setContentsOpaque:)]) {
|
|
|
|
// The opaque property seems to not be enough when using IOSurface contents.
|
|
|
|
// Additionally, call the private method setContentsOpaque.
|
2019-12-29 15:19:51 +03:00
|
|
|
[mContentCALayer setContentsOpaque:aIsOpaque];
|
2019-11-13 21:46:02 +03:00
|
|
|
}
|
2019-10-29 22:24:24 +03:00
|
|
|
[mWrappingCALayer addSublayer:mContentCALayer];
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
2019-11-25 22:06:16 +03:00
|
|
|
bool shouldTintOpaqueness = StaticPrefs::gfx_core_animation_tint_opaque();
|
|
|
|
if (shouldTintOpaqueness && !mOpaquenessTintLayer) {
|
|
|
|
mOpaquenessTintLayer = [[CALayer layer] retain];
|
|
|
|
mOpaquenessTintLayer.position = mContentCALayer.position;
|
|
|
|
mOpaquenessTintLayer.bounds = mContentCALayer.bounds;
|
|
|
|
mOpaquenessTintLayer.anchorPoint = NSZeroPoint;
|
|
|
|
mOpaquenessTintLayer.contentsGravity = kCAGravityTopLeft;
|
2019-12-29 15:19:51 +03:00
|
|
|
if (aIsOpaque) {
|
2019-11-25 22:06:16 +03:00
|
|
|
mOpaquenessTintLayer.backgroundColor =
|
|
|
|
[[[NSColor greenColor] colorWithAlphaComponent:0.5] CGColor];
|
|
|
|
} else {
|
|
|
|
mOpaquenessTintLayer.backgroundColor =
|
|
|
|
[[[NSColor redColor] colorWithAlphaComponent:0.5] CGColor];
|
|
|
|
}
|
|
|
|
[mWrappingCALayer addSublayer:mOpaquenessTintLayer];
|
|
|
|
} else if (!shouldTintOpaqueness && mOpaquenessTintLayer) {
|
|
|
|
[mOpaquenessTintLayer removeFromSuperlayer];
|
|
|
|
[mOpaquenessTintLayer release];
|
|
|
|
mOpaquenessTintLayer = nullptr;
|
|
|
|
}
|
|
|
|
|
2019-10-29 22:25:27 +03:00
|
|
|
// CALayers have a position and a size, specified through the position and the bounds properties.
|
|
|
|
// layer.bounds.origin must always be (0, 0).
|
|
|
|
// A layer's position affects the layer's entire layer subtree. In other words, each layer's
|
|
|
|
// position is relative to its superlayer's position. We implement the clip rect using
|
|
|
|
// masksToBounds on mWrappingCALayer. So mContentCALayer's position is relative to the clip rect
|
|
|
|
// position.
|
|
|
|
// Note: The Core Animation docs on "Positioning and Sizing Sublayers" say:
|
|
|
|
// Important: Always use integral numbers for the width and height of your layer.
|
|
|
|
// We hope that this refers to integral physical pixels, and not to integral logical coordinates.
|
|
|
|
|
2019-12-29 15:19:51 +03:00
|
|
|
auto globalClipOrigin = aClipRect ? aClipRect->TopLeft() : gfx::IntPoint{};
|
|
|
|
auto globalLayerOrigin = aPosition;
|
2019-10-29 22:25:27 +03:00
|
|
|
auto clipToLayerOffset = globalLayerOrigin - globalClipOrigin;
|
|
|
|
|
2019-11-13 21:46:02 +03:00
|
|
|
if (mMutatedBackingScale) {
|
|
|
|
mContentCALayer.bounds =
|
2019-12-29 15:19:51 +03:00
|
|
|
CGRectMake(0, 0, aSize.width / aBackingScale, aSize.height / aBackingScale);
|
2019-11-25 22:06:16 +03:00
|
|
|
if (mOpaquenessTintLayer) {
|
|
|
|
mOpaquenessTintLayer.bounds = mContentCALayer.bounds;
|
|
|
|
}
|
2019-12-29 15:19:51 +03:00
|
|
|
mContentCALayer.contentsScale = aBackingScale;
|
2019-11-13 21:46:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (mMutatedBackingScale || mMutatedClipRect) {
|
2019-08-20 01:54:26 +03:00
|
|
|
mWrappingCALayer.position =
|
2019-12-29 15:19:51 +03:00
|
|
|
CGPointMake(globalClipOrigin.x / aBackingScale, globalClipOrigin.y / aBackingScale);
|
|
|
|
if (aClipRect) {
|
2019-10-29 22:25:27 +03:00
|
|
|
mWrappingCALayer.masksToBounds = YES;
|
|
|
|
mWrappingCALayer.bounds =
|
2019-12-29 15:19:51 +03:00
|
|
|
CGRectMake(0, 0, aClipRect->Width() / aBackingScale, aClipRect->Height() / aBackingScale);
|
2019-10-29 22:25:27 +03:00
|
|
|
} else {
|
|
|
|
mWrappingCALayer.masksToBounds = NO;
|
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
2019-11-13 21:46:02 +03:00
|
|
|
if (mMutatedBackingScale || mMutatedPosition || mMutatedClipRect) {
|
2019-10-29 22:25:27 +03:00
|
|
|
mContentCALayer.position =
|
2019-12-29 15:19:51 +03:00
|
|
|
CGPointMake(clipToLayerOffset.x / aBackingScale, clipToLayerOffset.y / aBackingScale);
|
2019-11-25 22:06:16 +03:00
|
|
|
if (mOpaquenessTintLayer) {
|
|
|
|
mOpaquenessTintLayer.position = mContentCALayer.position;
|
|
|
|
}
|
2019-10-29 22:25:27 +03:00
|
|
|
}
|
2019-08-20 01:54:26 +03:00
|
|
|
|
2019-11-13 21:46:02 +03:00
|
|
|
if (mMutatedBackingScale || mMutatedSurfaceIsFlipped) {
|
2019-12-29 15:19:51 +03:00
|
|
|
if (aSurfaceIsFlipped) {
|
|
|
|
CGFloat height = aSize.height / aBackingScale;
|
2019-10-29 22:24:24 +03:00
|
|
|
mContentCALayer.affineTransform = CGAffineTransformMake(1.0, 0.0, 0.0, -1.0, 0.0, height);
|
|
|
|
} else {
|
|
|
|
mContentCALayer.affineTransform = CGAffineTransformIdentity;
|
2019-08-20 01:54:26 +03:00
|
|
|
}
|
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
|
2019-12-29 15:19:31 +03:00
|
|
|
if (mMutatedFrontSurface) {
|
2019-12-29 15:19:51 +03:00
|
|
|
mContentCALayer.contents = (id)aFrontSurface.get();
|
2019-12-29 15:19:31 +03:00
|
|
|
}
|
|
|
|
|
2019-10-29 22:25:27 +03:00
|
|
|
mMutatedPosition = false;
|
2019-11-13 21:46:02 +03:00
|
|
|
mMutatedBackingScale = false;
|
|
|
|
mMutatedSurfaceIsFlipped = false;
|
2019-10-29 22:25:27 +03:00
|
|
|
mMutatedClipRect = false;
|
2019-12-29 15:19:31 +03:00
|
|
|
mMutatedFrontSurface = false;
|
2019-08-20 01:54:26 +03:00
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
|
|
|
|
// Called when mMutex is already being held by the current thread.
|
2019-12-18 23:34:28 +03:00
|
|
|
Maybe<NativeLayerCA::SurfaceWithInvalidRegion> NativeLayerCA::GetUnusedSurfaceAndCleanUp(
|
2019-08-16 04:30:02 +03:00
|
|
|
const MutexAutoLock&) {
|
2019-12-18 23:34:43 +03:00
|
|
|
std::vector<SurfaceWithInvalidRegionAndCheckCount> usedSurfaces;
|
2019-12-18 23:34:28 +03:00
|
|
|
Maybe<SurfaceWithInvalidRegion> unusedSurface;
|
2019-08-16 04:30:02 +03:00
|
|
|
|
2019-12-18 23:34:28 +03:00
|
|
|
// Separate mSurfaces into used and unused surfaces.
|
|
|
|
for (auto& surf : mSurfaces) {
|
2019-12-18 23:34:43 +03:00
|
|
|
if (IOSurfaceIsInUse(surf.mEntry.mSurface.get())) {
|
|
|
|
surf.mCheckCount++;
|
|
|
|
if (surf.mCheckCount < 10) {
|
|
|
|
usedSurfaces.push_back(std::move(surf));
|
|
|
|
} else {
|
|
|
|
// The window server has been holding on to this surface for an unreasonably long time. This
|
|
|
|
// is known to happen sometimes, for example in occluded windows or after a GPU switch. In
|
|
|
|
// that case, release our references to the surface so that it doesn't look like we're
|
|
|
|
// trying to keep it alive.
|
|
|
|
mSurfacePoolHandle->ReturnSurfaceToPool(std::move(surf.mEntry.mSurface));
|
|
|
|
}
|
2019-08-16 04:30:02 +03:00
|
|
|
} else {
|
2019-12-18 23:34:28 +03:00
|
|
|
if (unusedSurface) {
|
|
|
|
// Multiple surfaces are unused. Keep the most recent one and release any earlier ones. The
|
|
|
|
// most recent one requires the least amount of copying during partial repaints.
|
|
|
|
mSurfacePoolHandle->ReturnSurfaceToPool(std::move(unusedSurface->mSurface));
|
|
|
|
}
|
2019-12-18 23:34:43 +03:00
|
|
|
unusedSurface = Some(std::move(surf.mEntry));
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-18 23:34:28 +03:00
|
|
|
// Put the used surfaces back into mSurfaces.
|
|
|
|
mSurfaces = std::move(usedSurfaces);
|
|
|
|
|
|
|
|
return unusedSurface;
|
2019-08-16 04:30:02 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace layers
|
|
|
|
} // namespace mozilla
|