diff options
author | Jesse Hall <jessehall@google.com> | 2013-11-08 12:58:20 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-08 12:58:20 -0800 |
commit | 1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74 (patch) | |
tree | a8ea31790625790337bc2e25ac6ceb82e1010e3d | |
parent | 2d32aa5918de1c12c54a32e8eb28bbc96d430796 (diff) | |
parent | 14e8b01a761180250671f3d6494532d8bd04fa8e (diff) | |
download | native-1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74.tar.gz |
am 14e8b01a: Don\'t change the framebuffer target until we render a new one
* commit '14e8b01a761180250671f3d6494532d8bd04fa8e':
Don't change the framebuffer target until we render a new one
-rw-r--r-- | services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp index 2bf7d21412..be5cf4a887 100644 --- a/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp +++ b/services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp @@ -174,14 +174,8 @@ status_t VirtualDisplaySurface::advanceFrame() { } mDbgState = DBG_STATE_HWC; - if (mCompositionType == COMPOSITION_HWC) { - // Use the output buffer for the FB as well, though conceptually the - // FB is unused on this frame. - mFbProducerSlot = mOutputProducerSlot; - mFbFence = mOutputFence; - } - - if (mFbProducerSlot < 0 || mOutputProducerSlot < 0) { + if (mOutputProducerSlot < 0 || + (mCompositionType != COMPOSITION_HWC && mFbProducerSlot < 0)) { // Last chance bailout if something bad happened earlier. For example, // in a GLES configuration, if the sink disappears then dequeueBuffer // will fail, the GLES driver won't queue a buffer, but SurfaceFlinger @@ -191,7 +185,8 @@ status_t VirtualDisplaySurface::advanceFrame() { return NO_MEMORY; } - sp<GraphicBuffer> fbBuffer = mProducerBuffers[mFbProducerSlot]; + sp<GraphicBuffer> fbBuffer = mFbProducerSlot >= 0 ? + mProducerBuffers[mFbProducerSlot] : sp<GraphicBuffer>(NULL); sp<GraphicBuffer> outBuffer = mProducerBuffers[mOutputProducerSlot]; VDS_LOGV("advanceFrame: fb=%d(%p) out=%d(%p)", mFbProducerSlot, fbBuffer.get(), @@ -201,7 +196,12 @@ status_t VirtualDisplaySurface::advanceFrame() { // so update HWC state with it. mHwc.setOutputBuffer(mDisplayId, mOutputFence, outBuffer); - return mHwc.fbPost(mDisplayId, mFbFence, fbBuffer); + status_t result = NO_ERROR; + if (fbBuffer != NULL) { + result = mHwc.fbPost(mDisplayId, mFbFence, fbBuffer); + } + + return result; } void VirtualDisplaySurface::onFrameCommitted() { @@ -458,9 +458,7 @@ void VirtualDisplaySurface::resetPerFrameState() { mCompositionType = COMPOSITION_UNKNOWN; mSinkBufferWidth = 0; mSinkBufferHeight = 0; - mFbFence = Fence::NO_FENCE; mOutputFence = Fence::NO_FENCE; - mFbProducerSlot = -1; mOutputProducerSlot = -1; } |