summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jesse Hall <jessehall@google.com> 2014-01-26 16:47:45 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-01-26 16:47:45 +0000
commit25f75c361098086ffa2b87dcc3f22ac5f64c05be (patch)
treea701f3a8f1b72416287f7a1e5d779e87095df14a
parentdd00090530340de22ca60f79446b5fe3050cd95f (diff)
parent8c303f7e64b3de7748922e6f951d9e82bc96badd (diff)
am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '8c303f7e64b3de7748922e6f951d9e82bc96badd': SurfaceFlinger: mFbFence initialization
-rw-r--r--services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp
index be5cf4a887..e203903418 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;
}