ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 6dbfc87d: am 32d4b6c8: Merge "SurfaceFlinger: Limit to 4k Layers"

Browse Source 
* commit '6dbfc87da5b07547b7ce7a0218fef3a90d23a6c4':
  SurfaceFlinger: Limit to 4k Layers
This commit is contained in:
Dan Stoza 2015-04-30 22:28:54 +00:00 committed by Android Git Automerger
commit f7a862a1d6
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2018,18 +2018,25 @@ void SurfaceFlinger::drawWormhole(const sp<const DisplayDevice>& hw, const Regio
engine.fillRegionWithColor(region, height, 0, 0, 0, 0); engine.fillRegionWithColor(region, height, 0, 0, 0, 0);
} }
void SurfaceFlinger::addClientLayer(const sp<Client>& client, status_t SurfaceFlinger::addClientLayer(const sp<Client>& client,
const sp<IBinder>& handle, const sp<IBinder>& handle,
const sp<IGraphicBufferProducer>& gbc, const sp<IGraphicBufferProducer>& gbc,
const sp<Layer>& lbc) const sp<Layer>& lbc)
{ {
// add this layer to the current state list
{
Mutex::Autolock _l(mStateLock);
if (mCurrentState.layersSortedByZ.size() >= MAX_LAYERS) {
return NO_MEMORY;
}
mCurrentState.layersSortedByZ.add(lbc);
mGraphicBufferProducerList.add(IInterface::asBinder(gbc));
}
// attach this layer to the client // attach this layer to the client
client->attachLayer(handle, lbc); client->attachLayer(handle, lbc);
// add this layer to the current state list return NO_ERROR;
Mutex::Autolock _l(mStateLock);
mCurrentState.layersSortedByZ.add(lbc);
mGraphicBufferProducerList.add(IInterface::asBinder(gbc));
} }
status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer) { status_t SurfaceFlinger::removeLayer(const sp<Layer>& layer) {
@ -2286,10 +2293,16 @@ status_t SurfaceFlinger::createLayer(
break; break;
} }
if (result == NO_ERROR) { if (result != NO_ERROR) {
addClientLayer(client, *handle, *gbp, layer); return result;
setTransactionFlags(eTransactionNeeded);
} }
result = addClientLayer(client, *handle, *gbp, layer);
if (result != NO_ERROR) {
return result;
}
setTransactionFlags(eTransactionNeeded);
return result; return result;
} }

4
services/surfaceflinger/SurfaceFlinger.h
View File

@ -144,6 +144,8 @@ private:
// every half hour. // every half hour.
enum { LOG_FRAME_STATS_PERIOD = 30*60*60 }; enum { LOG_FRAME_STATS_PERIOD = 30*60*60 };
static const size_t MAX_LAYERS = 4096;
// We're reference counted, never destroy SurfaceFlinger directly // We're reference counted, never destroy SurfaceFlinger directly
virtual ~SurfaceFlinger(); virtual ~SurfaceFlinger();
@ -305,7 +307,7 @@ private:
status_t removeLayer(const sp<Layer>& layer); status_t removeLayer(const sp<Layer>& layer);
// add a layer to SurfaceFlinger // add a layer to SurfaceFlinger
void addClientLayer(const sp<Client>& client, status_t addClientLayer(const sp<Client>& client,
const sp<IBinder>& handle, const sp<IBinder>& handle,
const sp<IGraphicBufferProducer>& gbc, const sp<IGraphicBufferProducer>& gbc,
const sp<Layer>& lbc); const sp<Layer>& lbc);