diff options
| author | Jesse Hall <jessehall@google.com> | 2014-01-26 16:50:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-26 16:50:36 +0000 |
| commit | 467113c6fcb1f4714d84d6d097c5525ae0130d00 (patch) | |
| tree | d308457ce043811546f8aa5f6d34eb3db1364505 /services/surfaceflinger/DisplayHardware | |
| parent | 8b7cc0aeb7559db3241d19aa6c93883ca991a784 (diff) | |
| parent | 25f75c361098086ffa2b87dcc3f22ac5f64c05be (diff) | |
| download | frameworks_native-467113c6fcb1f4714d84d6d097c5525ae0130d00.zip frameworks_native-467113c6fcb1f4714d84d6d097c5525ae0130d00.tar.gz frameworks_native-467113c6fcb1f4714d84d6d097c5525ae0130d00.tar.bz2 | |
am 25f75c36: am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '25f75c361098086ffa2b87dcc3f22ac5f64c05be':
SurfaceFlinger: mFbFence initialization
Diffstat (limited to 'services/surfaceflinger/DisplayHardware')
| -rw-r--r-- | services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index be5cf4a..e203903 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -458,6 +458,7 @@ void VirtualDisplaySurface::resetPerFrameState() { mCompositionType = COMPOSITION_UNKNOWN; mSinkBufferWidth = 0; mSinkBufferHeight = 0; + mFbFence = Fence::NO_FENCE; mOutputFence = Fence::NO_FENCE; mOutputProducerSlot = -1; } |