Add BufferQueueInterposer and use it for virtual displays
BufferQueueInterposer allows a client to tap into a
IGraphicBufferProducer-based buffer queue, and modify buffers as they
pass from producer to consumer. VirtualDisplaySurface uses this to
layer HWC composition on top of GLES composition before passing the
buffer to the virtual display consumer.
Bug: 8384764
Change-Id: I61ae54f3d90de6a35f4f02bb5e64e7cc88e1cb83
diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 4b6c413..eeb1fef 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -655,6 +655,18 @@
mLists[0]->sur = eglGetCurrentSurface(EGL_DRAW);
}
+ // For virtual displays, the framebufferTarget buffer also serves as
+ // the HWC output buffer, so we need to copy the buffer handle and
+ // dup() the acquire fence.
+ for (size_t i=HWC_NUM_DISPLAY_TYPES; i<mNumDisplays; i++) {
+ DisplayData& disp(mDisplayData[i]);
+ if (disp.framebufferTarget) {
+ mLists[i]->outbuf = disp.framebufferTarget->handle;
+ mLists[i]->outbufAcquireFenceFd =
+ dup(disp.framebufferTarget->acquireFenceFd);
+ }
+ }
+
err = mHwc->set(mHwc, mNumDisplays, mLists);
for (size_t i=0 ; i<mNumDisplays ; i++) {