From 921d1d7a61f527b7bbf42e9ba46bd92342cc7c99 Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Thu, 2 Apr 2015 13:48:15 -0700 Subject: Revert "libgui: Plumb attach/detach through CpuConsumer" This reverts commit 20c5672883796c0dedf38f51dc2fc6f140b09ae6. --- libs/gui/BufferQueueConsumer.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libs/gui/BufferQueueConsumer.cpp') diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp index c7faeebe75..526c3b7295 100644 --- a/libs/gui/BufferQueueConsumer.cpp +++ b/libs/gui/BufferQueueConsumer.cpp @@ -247,16 +247,12 @@ status_t BufferQueueConsumer::attachBuffer(int* outSlot, ATRACE_BUFFER_INDEX(*outSlot); BQ_LOGV("attachBuffer(C): returning slot %d", *outSlot); - // If these are modified, they also need to be modified in - // CpuConsumer::attachAndReleaseBuffer mSlots[*outSlot].mGraphicBuffer = buffer; - mSlots[*outSlot].mFence = Fence::NO_FENCE; - mSlots[*outSlot].mFrameNumber = 0; - - // Changes to these do not need to be propagated to CpuConsumer mSlots[*outSlot].mBufferState = BufferSlot::ACQUIRED; mSlots[*outSlot].mAttachedByConsumer = true; mSlots[*outSlot].mNeedsCleanupOnRelease = false; + mSlots[*outSlot].mFence = Fence::NO_FENCE; + mSlots[*outSlot].mFrameNumber = 0; // mAcquireCalled tells BufferQueue that it doesn't need to send a valid // GraphicBuffer pointer on the next acquireBuffer call, which decreases -- cgit v1.2.3-59-g8ed1b