mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 13:23:07 +00:00
ca19b65a80
- Bug 1250873 - Rename HasInternalBuffer into HasIntermediateBuffer in layers. r=sotaro (578235105f) - Bug 1256045 - Add a null-check in BufferTextureHost::EnsureWrappingTextureSource. r=jnicol (943c73559d) - Bug 1251726 - Check if Compositor is set r=nical (550d5b0164) - Bug 1251427 - Require a full update when a TextureHost switches from a TextureSource to another. r=sotaro (bc59ac4cd7) - Bug 1256693 - ISurfaceAllocator cleanup. r=sotaro (098e824d4d) - Bug 1257939 - initialize BGRX alpha channel to opaque when clearing and ignore uninitialized alpha in texture clients. r=mchang (73d778496f) - more of reapply Bug 1200595 - Consolidate the TextureClient's destruction logic (74517415ed) - Bug 1256693 - Refer to ClientIPCAllocator instead of ISurfaceAllocator where it makes sense. r=sotaro (e81f2dd923) - Bug 1236112 - Block on d3d9 video frames to complete before returning them from the decoder. r=cpearce (25114bb3c4) - Bug 1196409 - Disable D3D11-DXVA for resolutions not supported in hardware. r=jya (3007b1ebff) - Bug 1196411 - Disable DXVA on 60fps 1080p videos for AMD cards that can't decode quick enough. r=jya (9f8f67e12b) - Bug 1200775 - Check intel specific h264 decoder when checking for DXVA support. r=cpearce (e7bcbb10be) - Bug 1257013 - Part 1: Use readback to synchronize d3d9 video. r=cpearce,Bas (d247a9bed6) - Bug 1257013 - Part 2: Use readback to synchronize d3d11 video. r=cpearce,Bas (43883c1607) - missing bit of Bug 1206568: P2 (58de11b22f) - Bug 1239093 - Add pref to allow overriding of hardcoded DXVA blacklist. r=jrmuizel (dfd5e57c2f) - Bug 1217185: To allow for sandboxing, use null HWNDs when creating the D3D device for video decoding. r=mattwoodrow (0c96e66a47) - Bug 1200775 - Followup to fix typo and indent issues (b1d1c76788) - bits of Bug 1207245 - part 3 (52a1939b74) - Bug 1224199 - Don't make the TextureClient wait for compositor recycle if the GLContext is shutting down - r=nical (9a0081f217) - more of Bug 1200595 (047201fd60) - Bug 1253094, part 2 - Stop using DebugOnly for class/struct members in gfx/. r=Bas (bab6569366)
170 lines
5.6 KiB
C++
170 lines
5.6 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 "gfxPlatform.h"
|
|
#include "mozilla/layers/ISurfaceAllocator.h"
|
|
#include "mozilla/layers/CompositableForwarder.h"
|
|
#include "TextureClientRecycleAllocator.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
// Used to keep TextureClient's reference count stable as not to disrupt recycling.
|
|
class TextureClientHolder
|
|
{
|
|
~TextureClientHolder() {}
|
|
public:
|
|
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(TextureClientHolder)
|
|
|
|
explicit TextureClientHolder(TextureClient* aClient)
|
|
: mTextureClient(aClient)
|
|
{}
|
|
|
|
TextureClient* GetTextureClient()
|
|
{
|
|
return mTextureClient;
|
|
}
|
|
|
|
void ClearTextureClient() { mTextureClient = nullptr; }
|
|
protected:
|
|
RefPtr<TextureClient> mTextureClient;
|
|
};
|
|
|
|
TextureClientRecycleAllocator::TextureClientRecycleAllocator(CompositableForwarder* aAllocator)
|
|
: mSurfaceAllocator(aAllocator)
|
|
, mMaxPooledSize(kMaxPooledSized)
|
|
, mLock("TextureClientRecycleAllocatorImp.mLock")
|
|
{
|
|
}
|
|
|
|
TextureClientRecycleAllocator::~TextureClientRecycleAllocator()
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
while (!mPooledClients.empty()) {
|
|
mPooledClients.pop();
|
|
}
|
|
MOZ_ASSERT(mInUseClients.empty());
|
|
}
|
|
|
|
void
|
|
TextureClientRecycleAllocator::SetMaxPoolSize(uint32_t aMax)
|
|
{
|
|
mMaxPooledSize = aMax;
|
|
}
|
|
|
|
class TextureClientRecycleTask : public Task
|
|
{
|
|
public:
|
|
explicit TextureClientRecycleTask(TextureClient* aClient, TextureFlags aFlags)
|
|
: mTextureClient(aClient)
|
|
, mFlags(aFlags)
|
|
{}
|
|
|
|
virtual void Run() override
|
|
{
|
|
mTextureClient->RecycleTexture(mFlags);
|
|
}
|
|
|
|
private:
|
|
RefPtr<TextureClient> mTextureClient;
|
|
TextureFlags mFlags;
|
|
};
|
|
|
|
already_AddRefed<TextureClient>
|
|
TextureClientRecycleAllocator::CreateOrRecycle(gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
BackendSelector aSelector,
|
|
TextureFlags aTextureFlags,
|
|
TextureAllocationFlags aAllocFlags)
|
|
{
|
|
// TextureAllocationFlags is actually used only by ContentClient.
|
|
// This class does not handle ContentClient's TextureClient allocation.
|
|
MOZ_ASSERT(aAllocFlags == TextureAllocationFlags::ALLOC_DEFAULT ||
|
|
aAllocFlags == TextureAllocationFlags::ALLOC_DISALLOW_BUFFERTEXTURECLIENT ||
|
|
aAllocFlags == TextureAllocationFlags::ALLOC_FOR_OUT_OF_BAND_CONTENT ||
|
|
aAllocFlags == TextureAllocationFlags::ALLOC_MANUAL_SYNCHRONIZATION);
|
|
MOZ_ASSERT(!(aTextureFlags & TextureFlags::RECYCLE));
|
|
aTextureFlags = aTextureFlags | TextureFlags::RECYCLE; // Set recycle flag
|
|
|
|
RefPtr<TextureClientHolder> textureHolder;
|
|
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
if (!mPooledClients.empty()) {
|
|
textureHolder = mPooledClients.top();
|
|
mPooledClients.pop();
|
|
Task* task = nullptr;
|
|
// If a pooled TextureClient is not compatible, release it.
|
|
if (textureHolder->GetTextureClient()->GetFormat() != aFormat ||
|
|
textureHolder->GetTextureClient()->GetSize() != aSize) {
|
|
// Release TextureClient.
|
|
task = new TextureClientReleaseTask(textureHolder->GetTextureClient());
|
|
textureHolder->ClearTextureClient();
|
|
textureHolder = nullptr;
|
|
} else {
|
|
task = new TextureClientRecycleTask(textureHolder->GetTextureClient(), aTextureFlags);
|
|
}
|
|
mSurfaceAllocator->GetMessageLoop()->PostTask(FROM_HERE, task);
|
|
}
|
|
}
|
|
|
|
if (!textureHolder) {
|
|
// Allocate new TextureClient
|
|
RefPtr<TextureClient> texture = Allocate(aFormat, aSize, aSelector, aTextureFlags, aAllocFlags);
|
|
if (!texture) {
|
|
return nullptr;
|
|
}
|
|
textureHolder = new TextureClientHolder(texture);
|
|
}
|
|
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
MOZ_ASSERT(mInUseClients.find(textureHolder->GetTextureClient()) == mInUseClients.end());
|
|
// Register TextureClient
|
|
mInUseClients[textureHolder->GetTextureClient()] = textureHolder;
|
|
}
|
|
RefPtr<TextureClient> client(textureHolder->GetTextureClient());
|
|
|
|
// Make sure the texture holds a reference to us, and ask it to call RecycleTextureClient when its
|
|
// ref count drops to 1.
|
|
client->SetRecycleAllocator(this);
|
|
return client.forget();
|
|
}
|
|
|
|
already_AddRefed<TextureClient>
|
|
TextureClientRecycleAllocator::Allocate(gfx::SurfaceFormat aFormat,
|
|
gfx::IntSize aSize,
|
|
BackendSelector aSelector,
|
|
TextureFlags aTextureFlags,
|
|
TextureAllocationFlags aAllocFlags)
|
|
{
|
|
return TextureClient::CreateForDrawing(mSurfaceAllocator, aFormat, aSize, aSelector,
|
|
aTextureFlags, aAllocFlags);
|
|
}
|
|
|
|
void
|
|
TextureClientRecycleAllocator::RecycleTextureClient(TextureClient* aClient)
|
|
{
|
|
// Clearing the recycle allocator drops a reference, so make sure we stay alive
|
|
// for the duration of this function.
|
|
RefPtr<TextureClientRecycleAllocator> kungFuDeathGrip(this);
|
|
aClient->SetRecycleAllocator(nullptr);
|
|
|
|
RefPtr<TextureClientHolder> textureHolder;
|
|
{
|
|
MutexAutoLock lock(mLock);
|
|
if (mInUseClients.find(aClient) != mInUseClients.end()) {
|
|
textureHolder = mInUseClients[aClient]; // Keep reference count of TextureClientHolder within lock.
|
|
if (mPooledClients.size() < mMaxPooledSize) {
|
|
mPooledClients.push(textureHolder);
|
|
}
|
|
mInUseClients.erase(aClient);
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace layers
|
|
} // namespace mozilla
|