wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1048984.1: Utility methods for managing texture pool returns. Make sure tiles go back to the correct pool. r=nsilva

Browse Source
This commit is contained in:
Milan Sreckovic 2014-09-16 10:07:46 -04:00
parent 49e8d9f9c9
commit 895d701e4f
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/layers/client/ClientLayerManager.cpp
View File

@ -664,6 +664,21 @@ ClientLayerManager::GetSimpleTileTexturePool(SurfaceFormat aFormat)
return mSimpleTilePools[index];
}
void
ClientLayerManager::ReturnTextureClientDeferred(TextureClient& aClient) {
GetTexturePool(aClient.GetFormat())->ReturnTextureClientDeferred(&aClient);
}
void
ClientLayerManager::ReturnTextureClient(TextureClient& aClient) {
GetTexturePool(aClient.GetFormat())->ReturnTextureClient(&aClient);
}
void
ClientLayerManager::ReportClientLost(TextureClient& aClient) {
GetTexturePool(aClient.GetFormat())->ReportClientLost();
}
void
ClientLayerManager::ClearCachedResources(Layer* aSubtree)
{

5
gfx/layers/client/ClientLayerManager.h
View File

@ -126,6 +126,11 @@ public:
TextureClientPool* GetTexturePool(gfx::SurfaceFormat aFormat);
SimpleTextureClientPool* GetSimpleTileTexturePool(gfx::SurfaceFormat aFormat);
/// Utility methods for managing texture clients.
void ReturnTextureClientDeferred(TextureClient& aClient);
void ReturnTextureClient(TextureClient& aClient);
void ReportClientLost(TextureClient& aClient);
// Drop cached resources and ask our shadow manager to do the same,
// if we have one.
virtual void ClearCachedResources(Layer* aSubtree = nullptr) MOZ_OVERRIDE;

30
gfx/layers/client/TiledContentClient.cpp
View File

@ -658,9 +658,9 @@ TileClient::DiscardFrontBuffer()
mFrontBuffer);
}
#endif
mManager->GetTexturePool(mFrontBuffer->GetFormat())->ReturnTextureClientDeferred(mFrontBuffer);
mManager->ReturnTextureClientDeferred(*mFrontBuffer);
if (mFrontBufferOnWhite) {
mManager->GetTexturePool(mFrontBufferOnWhite->GetFormat())->ReturnTextureClientDeferred(mFrontBufferOnWhite);
mManager->ReturnTextureClientDeferred(*mFrontBufferOnWhite);
}
mFrontLock->ReadUnlock();
if (mFrontBuffer->IsLocked()) {
@ -684,12 +684,14 @@ TileClient::DiscardBackBuffer()
// Our current back-buffer is still locked by the compositor. This can occur
// when the client is producing faster than the compositor can consume. In
// this case we just want to drop it and not return it to the pool.
mManager->GetTexturePool(mBackBuffer->GetFormat())->ReportClientLost();
mManager->ReportClientLost(*mBackBuffer);
if (mBackBufferOnWhite) {
mManager->GetTexturePool(mBackBufferOnWhite->GetFormat())->ReportClientLost();
mManager->ReportClientLost(*mBackBufferOnWhite);
}
} else {
#if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
// If this assertions stops being true, we need to add
// ReturnTextureClientDeferred(*mBackBufferOnWhite) below.
MOZ_ASSERT(!mBackBufferOnWhite);
if (mBackBuffer->GetIPDLActor() &&
mCompositableClient && mCompositableClient->GetIPDLActor()) {
@ -705,11 +707,11 @@ TileClient::DiscardBackBuffer()
}
// TextureClient can be reused after transaction complete,
// when RemoveTextureFromCompositableTracker is used.
mManager->GetTexturePool(mBackBuffer->GetFormat())->ReturnTextureClientDeferred(mBackBuffer);
mManager->ReturnTextureClientDeferred(*mBackBuffer);
#else
mManager->GetTexturePool(mBackBuffer->GetFormat())->ReturnTextureClient(mBackBuffer);
mManager->ReturnTextureClient(*mBackBuffer);
if (mBackBufferOnWhite) {
mManager->GetTexturePool(mBackBufferOnWhite->GetFormat())->ReturnTextureClient(mBackBufferOnWhite);
mManager->ReturnTextureClient(*mBackBufferOnWhite);
}
#endif
}
@ -735,8 +737,6 @@ TileClient::GetBackBuffer(const nsIntRegion& aDirtyRegion,
bool aCanRerasterizeValidRegion,
RefPtr<TextureClient>* aBackBufferOnWhite)
{
TextureClientPool *pool =
mManager->GetTexturePool(gfxPlatform::GetPlatform()->Optimal2DFormatForContent(aContent));
// Try to re-use the front-buffer if possible
if (mFrontBuffer &&
mFrontBuffer->HasInternalBuffer() &&
@ -761,11 +761,15 @@ TileClient::GetBackBuffer(const nsIntRegion& aDirtyRegion,
// Our current back-buffer is still locked by the compositor. This can occur
// when the client is producing faster than the compositor can consume. In
// this case we just want to drop it and not return it to the pool.
pool->ReportClientLost();
if (mBackBufferOnWhite) {
pool->ReportClientLost();
}
mManager->ReportClientLost(*mBackBuffer);
}
if (mBackBufferOnWhite) {
mManager->ReportClientLost(*mBackBufferOnWhite);
mBackBufferOnWhite = nullptr;
}
TextureClientPool *pool =
mManager->GetTexturePool(gfxPlatform::GetPlatform()->Optimal2DFormatForContent(aContent));
mBackBuffer.Set(this, pool->GetTextureClient());
if (!mBackBuffer) {
return nullptr;