diff options
| author | Dan Stoza <stoza@google.com> | 2015-06-05 15:38:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-05 15:38:35 +0000 |
| commit | 9d2c5a7c678bd384df0fb29952cf8943e7b1b160 (patch) | |
| tree | 1390497a56f7ddd62e09e5f0461ae8f35e947954 /services/surfaceflinger | |
| parent | 17833a1b0d70cd5cea342cadea9fdbbf16748bc6 (diff) | |
| parent | 812ed0644f8f8f71ca403f4e5793f0dbc1fcf9b2 (diff) | |
| download | frameworks_native-9d2c5a7c678bd384df0fb29952cf8943e7b1b160.zip frameworks_native-9d2c5a7c678bd384df0fb29952cf8943e7b1b160.tar.gz frameworks_native-9d2c5a7c678bd384df0fb29952cf8943e7b1b160.tar.bz2 | |
Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev
Diffstat (limited to 'services/surfaceflinger')
4 files changed, 11 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index 11cbdc6..ee8d41c 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -530,6 +530,11 @@ status_t VirtualDisplaySurface::allowAllocation(bool /* allow */) { return INVALID_OPERATION; } +status_t VirtualDisplaySurface::setGenerationNumber(uint32_t /* generation */) { + ALOGE("setGenerationNumber not supported on VirtualDisplaySurface"); + return INVALID_OPERATION; +} + void VirtualDisplaySurface::updateQueueBufferOutput( const QueueBufferOutput& qbo) { uint32_t w, h, transformHint, numPendingBuffers; diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h index 97af980..ff02290 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h @@ -116,6 +116,7 @@ private: virtual void allocateBuffers(bool async, uint32_t width, uint32_t height, PixelFormat format, uint32_t usage); virtual status_t allowAllocation(bool allow); + virtual status_t setGenerationNumber(uint32_t generationNumber); // // Utility methods diff --git a/services/surfaceflinger/MonitoredProducer.cpp b/services/surfaceflinger/MonitoredProducer.cpp index 9fb555b..6f25bf5 100644 --- a/services/surfaceflinger/MonitoredProducer.cpp +++ b/services/surfaceflinger/MonitoredProducer.cpp @@ -114,6 +114,10 @@ status_t MonitoredProducer::allowAllocation(bool allow) { return mProducer->allowAllocation(allow); } +status_t MonitoredProducer::setGenerationNumber(uint32_t generationNumber) { + return mProducer->setGenerationNumber(generationNumber); +} + IBinder* MonitoredProducer::onAsBinder() { return IInterface::asBinder(mProducer).get(); } diff --git a/services/surfaceflinger/MonitoredProducer.h b/services/surfaceflinger/MonitoredProducer.h index b2f8293..ff691d8 100644 --- a/services/surfaceflinger/MonitoredProducer.h +++ b/services/surfaceflinger/MonitoredProducer.h @@ -54,6 +54,7 @@ public: virtual void allocateBuffers(bool async, uint32_t width, uint32_t height, PixelFormat format, uint32_t usage); virtual status_t allowAllocation(bool allow); + virtual status_t setGenerationNumber(uint32_t generationNumber); virtual IBinder* onAsBinder(); private: |