diff options
author | Jamie Gennis <jgennis@google.com> | 2011-11-17 05:46:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 05:46:00 -0800 |
commit | 04dd4deafdbde8e4a9d12745e3d4a886ef8769f4 (patch) | |
tree | 138bed74f6d156ffe0ac11fdaccec295a19d2312 /include/gui | |
parent | 6c932dab1cef4fc711c4fdab938bced67b15d5df (diff) | |
parent | 7765fc651a9519dd2f0ac9d3374a50e9865c5c99 (diff) | |
download | frameworks_base-04dd4deafdbde8e4a9d12745e3d4a886ef8769f4.zip frameworks_base-04dd4deafdbde8e4a9d12745e3d4a886ef8769f4.tar.gz frameworks_base-04dd4deafdbde8e4a9d12745e3d4a886ef8769f4.tar.bz2 |
am 7765fc65: am fd6b64f6: Merge "SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call" into ics-mr1
* commit '7765fc651a9519dd2f0ac9d3374a50e9865c5c99':
SurfaceTexture: Fix to return the oldest of free buffers to Client on Dequeue call
Diffstat (limited to 'include/gui')
-rw-r--r-- | include/gui/SurfaceTexture.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/include/gui/SurfaceTexture.h b/include/gui/SurfaceTexture.h index d7dd4d6..27d863d 100644 --- a/include/gui/SurfaceTexture.h +++ b/include/gui/SurfaceTexture.h @@ -271,7 +271,8 @@ private: mRequestBufferCalled(false), mTransform(0), mScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE), - mTimestamp(0) { + mTimestamp(0), + mFrameNumber(0) { mCrop.makeInvalid(); } @@ -340,6 +341,10 @@ private: // mTimestamp is the current timestamp for this buffer slot. This gets // to set by queueBuffer each time this slot is queued. int64_t mTimestamp; + + // mFrameNumber is the number of the queued frame for this slot. + uint64_t mFrameNumber; + }; // mSlots is the array of buffer slots that must be mirrored on the client @@ -476,6 +481,12 @@ private: // around a GL driver limitation on the number of FBO attachments, which the // browser's tile cache exceeds. const GLenum mTexTarget; + + // mFrameCounter is the free running counter, incremented for every buffer queued + // with the surface Texture. + uint64_t mFrameCounter; + + }; // ---------------------------------------------------------------------------- |