mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
7f6fda62d8
- Bug 1208661 - Make ContentClient dumping play nicely with HTML dumping. r=BenWa (18b2c4a11b) - Bug 1204895 - Add fence handling to AutoRemoveTexture on gonk r=nical (d1f21e0210) - Bug 1208661 - Support dumping client-side layer textures without compression. r=BenWa (22ee0a45b5) - Bug 1206915 - Avoid reordering of different parts of paint dump output. r=mattwoodrow (0c7d46bca1) - Bug 1208661 - Do not assume that PaintRoot()'s contributions to the HTML paint dump will all be inside a <script> tag. r=BenWa (5917d13001) - Bug 1203992 - Distinguish between SingleTiledContentClient and MultiTiledContentClient in the layer tree dump. r=nical (70955c53cc) - Bug 1207590 - Don't use SingleTiledContentClient for layers that are larger than the maximum texture size. r=mattwoodrow (dd2a094297) - Bug 1201541 - Use SingleTiledContentClient for non-scrollable layers on Android r=mattwoodrow (6010b5080d) - missing of Bug 1161662 - Exclude post scale from layer.GetTransform(). r=roc (a3c92f89ae) - Bug 1172537 - Make the warning: "Tiled PaintedLayer with no scrollable container ancestor" occur only on actual b2g phones. r=nical (d604c9e9da) - Bug 1204597 - Use Move constructor for opaque region in FrameLayerBuilder instead of copying. r=jrmuizel (26bf99c0fb) - Bug 1201541 - Add a pref for disabling single tile layers r=mattwoodrow (e3170f8f4c) - Bug 1172719 - Fix SharedSurface fence handling on gonk r=jgilbert,nical (9fdf5fef4f) - Support all blend modes in the basic compositor. (bug 1203829 part 1, r=mattwoodrow) (ac9eeca118) - Compile shaders with newer fxc. (bug 1203829 part 2, r=mattwoodrow) (3fd4acc1ec) - Refactor shader initialization in CompositorD3D11. (bug 1203829 part 3, r=mattwoodrow) (a5e79828ad) - Handle screen and multiply blend modes in the D3D11 compositor. (bug 1203829 part 4, r=mattwoodrow) (b20c4af7fc) - Bug 1173107: Add hexa() around various hr logging. r=jrmuizel a=KWierso (76d6d27ff9) - Get the sync texture's sync handle during compositor initialization, where it can be made to fail gracefully. (bug 1207665 part 3, r=bas) (98d15069a0) - Log initialization failures in CompositorD3D11.cpp. (bug 1211109 part 1, r=mattwoodrow) (211725e4ce) - Don't use Direct2D if CompositorD3D11::Initialize fails. (bug 1208638, r=jrmuizel) (17a119bc1a) - Bug 1143653 - Typo fix in a variable name. r=me (469e89d0b6) - Remove the static compositor backend variable. (bug 1211109 part 2, r=mattwoodrow) (3b7dcb9a7c) - Allow top-level window changes to the remembered compositor type. (bug 1211109 part 3, r=mattwoodrow) (9309cdfd0f) - Remove ISurfaceAllocator::GetCompositorBackend. (bug 1211109 part 4, r=mattwoodrow) (2928f757c8) - Bug 1143653 - Backout part of the initial patch because of crashes. (33637851d4) - missing bit of 687388 (19770529ef) - Bug 1208071 - Ensure that only valid texture actors are added to ImageBridge tarnsactions. r=sotaro (23bef4f601) - Bug 1197534 - Send RecycleTexture messages from the ImageBridge thread. r=sotaro (7249beb404)
272 lines
8.9 KiB
C++
272 lines
8.9 KiB
C++
/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; 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/. */
|
|
|
|
#include "TextureClientPool.h"
|
|
#include "CompositableClient.h"
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
|
|
#include "gfxPrefs.h"
|
|
|
|
#include "nsComponentManagerUtils.h"
|
|
|
|
#define TCP_LOG(...)
|
|
//#define TCP_LOG(...) printf_stderr(__VA_ARGS__);
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
static void
|
|
ShrinkCallback(nsITimer *aTimer, void *aClosure)
|
|
{
|
|
static_cast<TextureClientPool*>(aClosure)->ShrinkToMinimumSize();
|
|
}
|
|
|
|
TextureClientPool::TextureClientPool(gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
uint32_t aMaxTextureClients,
|
|
uint32_t aShrinkTimeoutMsec,
|
|
CompositableForwarder* aAllocator)
|
|
: mFormat(aFormat)
|
|
, mSize(aSize)
|
|
, mMaxTextureClients(aMaxTextureClients)
|
|
, mShrinkTimeoutMsec(aShrinkTimeoutMsec)
|
|
, mOutstandingClients(0)
|
|
, mSurfaceAllocator(aAllocator)
|
|
{
|
|
TCP_LOG("TexturePool %p created with max size %u and timeout %u\n",
|
|
this, mMaxTextureClients, aShrinkTimeoutMsec);
|
|
mTimer = do_CreateInstance("@mozilla.org/timer;1");
|
|
if (aFormat == gfx::SurfaceFormat::UNKNOWN) {
|
|
gfxWarning() << "Creating texture pool for SurfaceFormat::UNKNOWN format";
|
|
}
|
|
}
|
|
|
|
TextureClientPool::~TextureClientPool()
|
|
{
|
|
mTimer->Cancel();
|
|
}
|
|
|
|
#ifdef GFX_DEBUG_TRACK_CLIENTS_IN_POOL
|
|
static bool TestClientPool(const char* what,
|
|
TextureClient* aClient,
|
|
TextureClientPool* aPool)
|
|
{
|
|
if (!aClient || !aPool) {
|
|
return false;
|
|
}
|
|
|
|
TextureClientPool* actual = aClient->mPoolTracker;
|
|
bool ok = (actual == aPool);
|
|
if (ok) {
|
|
ok = (aClient->GetFormat() == aPool->GetFormat());
|
|
}
|
|
|
|
if (!ok) {
|
|
if (actual) {
|
|
gfxCriticalError() << "Pool error(" << what << "): "
|
|
<< aPool << "-" << aPool->GetFormat() << ", "
|
|
<< actual << "-" << actual->GetFormat() << ", "
|
|
<< aClient->GetFormat();
|
|
MOZ_CRASH("Crashing with actual");
|
|
} else {
|
|
gfxCriticalError() << "Pool error(" << what << "): "
|
|
<< aPool << "-" << aPool->GetFormat() << ", nullptr, "
|
|
<< aClient->GetFormat();
|
|
MOZ_CRASH("Crashing without actual");
|
|
}
|
|
}
|
|
return ok;
|
|
}
|
|
#endif
|
|
|
|
already_AddRefed<TextureClient>
|
|
TextureClientPool::GetTextureClient()
|
|
{
|
|
// Try to fetch a client from the pool
|
|
RefPtr<TextureClient> textureClient;
|
|
if (mTextureClients.size()) {
|
|
mOutstandingClients++;
|
|
textureClient = mTextureClients.top();
|
|
mTextureClients.pop();
|
|
#ifdef GFX_DEBUG_TRACK_CLIENTS_IN_POOL
|
|
DebugOnly<bool> ok = TestClientPool("fetch", textureClient, this);
|
|
MOZ_ASSERT(ok);
|
|
#endif
|
|
TCP_LOG("TexturePool %p giving %p from pool; size %u outstanding %u\n",
|
|
this, textureClient.get(), mTextureClients.size(), mOutstandingClients);
|
|
return textureClient.forget();
|
|
}
|
|
|
|
// We're increasing the number of outstanding TextureClients without reusing a
|
|
// client, we may need to free a deferred-return TextureClient.
|
|
ShrinkToMaximumSize();
|
|
|
|
// No unused clients in the pool, create one
|
|
if (gfxPrefs::ForceShmemTiles()) {
|
|
// gfx::BackendType::NONE means use the content backend
|
|
textureClient = TextureClient::CreateForRawBufferAccess(mSurfaceAllocator,
|
|
mFormat, mSize, gfx::BackendType::NONE,
|
|
TextureFlags::IMMEDIATE_UPLOAD, ALLOC_DEFAULT);
|
|
} else {
|
|
textureClient = TextureClient::CreateForDrawing(mSurfaceAllocator,
|
|
mFormat, mSize, BackendSelector::Content, TextureFlags::IMMEDIATE_UPLOAD);
|
|
}
|
|
|
|
mOutstandingClients++;
|
|
#ifdef GFX_DEBUG_TRACK_CLIENTS_IN_POOL
|
|
if (textureClient) {
|
|
textureClient->mPoolTracker = this;
|
|
}
|
|
#endif
|
|
TCP_LOG("TexturePool %p giving new %p; size %u outstanding %u\n",
|
|
this, textureClient.get(), mTextureClients.size(), mOutstandingClients);
|
|
return textureClient.forget();
|
|
}
|
|
|
|
void
|
|
TextureClientPool::ReturnTextureClient(TextureClient *aClient)
|
|
{
|
|
if (!aClient) {
|
|
return;
|
|
}
|
|
#ifdef GFX_DEBUG_TRACK_CLIENTS_IN_POOL
|
|
DebugOnly<bool> ok = TestClientPool("return", aClient, this);
|
|
MOZ_ASSERT(ok);
|
|
#endif
|
|
// Add the client to the pool:
|
|
MOZ_ASSERT(mOutstandingClients > mTextureClientsDeferred.size());
|
|
mOutstandingClients--;
|
|
mTextureClients.push(aClient);
|
|
TCP_LOG("TexturePool %p had client %p returned; size %u outstanding %u\n",
|
|
this, aClient, mTextureClients.size(), mOutstandingClients);
|
|
|
|
// Shrink down if we're beyond our maximum size
|
|
ShrinkToMaximumSize();
|
|
|
|
// Kick off the pool shrinking timer if there are still more unused texture
|
|
// clients than our desired minimum cache size.
|
|
if (mTextureClients.size() > sMinCacheSize) {
|
|
TCP_LOG("TexturePool %p scheduling a shrink-to-min-size\n", this);
|
|
mTimer->InitWithFuncCallback(ShrinkCallback, this, mShrinkTimeoutMsec,
|
|
nsITimer::TYPE_ONE_SHOT);
|
|
}
|
|
}
|
|
|
|
void
|
|
TextureClientPool::ReturnTextureClientDeferred(TextureClient *aClient)
|
|
{
|
|
if (!aClient) {
|
|
return;
|
|
}
|
|
#ifdef GFX_DEBUG_TRACK_CLIENTS_IN_POOL
|
|
DebugOnly<bool> ok = TestClientPool("defer", aClient, this);
|
|
MOZ_ASSERT(ok);
|
|
#endif
|
|
mTextureClientsDeferred.push(aClient);
|
|
TCP_LOG("TexturePool %p had client %p defer-returned, size %u outstanding %u\n",
|
|
this, aClient, mTextureClientsDeferred.size(), mOutstandingClients);
|
|
ShrinkToMaximumSize();
|
|
}
|
|
|
|
void
|
|
TextureClientPool::ShrinkToMaximumSize()
|
|
{
|
|
uint32_t totalClientsOutstanding = mTextureClients.size() + mOutstandingClients;
|
|
TCP_LOG("TexturePool %p shrinking to max size %u; total outstanding %u\n",
|
|
this, mMaxTextureClients, totalClientsOutstanding);
|
|
|
|
// We're over our desired maximum size, immediately shrink down to the
|
|
// maximum, or zero if we have too many outstanding texture clients.
|
|
// We cull from the deferred TextureClients first, as we can't reuse those
|
|
// until they get returned.
|
|
while (totalClientsOutstanding > mMaxTextureClients) {
|
|
if (mTextureClientsDeferred.size()) {
|
|
MOZ_ASSERT(mOutstandingClients > 0);
|
|
mOutstandingClients--;
|
|
TCP_LOG("TexturePool %p dropped deferred client %p; %u remaining\n",
|
|
this, mTextureClientsDeferred.top().get(),
|
|
mTextureClientsDeferred.size() - 1);
|
|
mTextureClientsDeferred.pop();
|
|
} else {
|
|
if (!mTextureClients.size()) {
|
|
// Getting here means we're over our desired number of TextureClients
|
|
// with none in the pool. This can happen for pathological cases, or
|
|
// it could mean that mMaxTextureClients needs adjusting for whatever
|
|
// device we're running on.
|
|
TCP_LOG("TexturePool %p encountering pathological case!\n", this);
|
|
break;
|
|
}
|
|
TCP_LOG("TexturePool %p dropped non-deferred client %p; %u remaining\n",
|
|
this, mTextureClients.top().get(), mTextureClients.size() - 1);
|
|
mTextureClients.pop();
|
|
}
|
|
totalClientsOutstanding--;
|
|
}
|
|
}
|
|
|
|
void
|
|
TextureClientPool::ShrinkToMinimumSize()
|
|
{
|
|
TCP_LOG("TexturePool %p shrinking to minimum size %u\n", this, sMinCacheSize);
|
|
while (mTextureClients.size() > sMinCacheSize) {
|
|
TCP_LOG("TexturePool %p popped %p; shrunk to %u\n",
|
|
this, mTextureClients.top().get(), mTextureClients.size() - 1);
|
|
mTextureClients.pop();
|
|
}
|
|
}
|
|
|
|
void
|
|
TextureClientPool::ReturnDeferredClients()
|
|
{
|
|
TCP_LOG("TexturePool %p returning %u deferred clients to pool\n",
|
|
this, mTextureClientsDeferred.size());
|
|
while (!mTextureClientsDeferred.empty()) {
|
|
mTextureClients.push(mTextureClientsDeferred.top());
|
|
mTextureClientsDeferred.pop();
|
|
|
|
MOZ_ASSERT(mOutstandingClients > 0);
|
|
mOutstandingClients--;
|
|
}
|
|
ShrinkToMaximumSize();
|
|
|
|
// Kick off the pool shrinking timer if there are still more unused texture
|
|
// clients than our desired minimum cache size.
|
|
if (mTextureClients.size() > sMinCacheSize) {
|
|
TCP_LOG("TexturePool %p kicking off shrink-to-min timer\n", this);
|
|
mTimer->InitWithFuncCallback(ShrinkCallback, this, mShrinkTimeoutMsec,
|
|
nsITimer::TYPE_ONE_SHOT);
|
|
}
|
|
}
|
|
|
|
void
|
|
TextureClientPool::ReportClientLost()
|
|
{
|
|
MOZ_ASSERT(mOutstandingClients > mTextureClientsDeferred.size());
|
|
mOutstandingClients--;
|
|
TCP_LOG("TexturePool %p getting report client lost; down to %u outstanding\n",
|
|
this, mOutstandingClients);
|
|
}
|
|
|
|
void
|
|
TextureClientPool::Clear()
|
|
{
|
|
TCP_LOG("TexturePool %p getting cleared\n", this);
|
|
while (!mTextureClients.empty()) {
|
|
TCP_LOG("TexturePool %p releasing client %p\n",
|
|
this, mTextureClients.top().get());
|
|
mTextureClients.pop();
|
|
}
|
|
while (!mTextureClientsDeferred.empty()) {
|
|
MOZ_ASSERT(mOutstandingClients > 0);
|
|
mOutstandingClients--;
|
|
TCP_LOG("TexturePool %p releasing deferred client %p\n",
|
|
this, mTextureClientsDeferred.top().get());
|
|
mTextureClientsDeferred.pop();
|
|
}
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|