Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 028dc8f2 authored by Jesse Hall's avatar Jesse Hall
Browse files

Provide HWC prepare with a valid output buffer 

We weren't dequeing and setting the output buffer until just before
set(). This didn't allow HWC to make decisions in prepare() based on
the output buffer format, dimensions, etc.

Now we dequeue the output buffer at the beginning of the composition
loop and provide it to HWC in prepare. In GLES-only rendering, we may
have to cancel the buffer and acquire a new one if GLES requests a
buffer with properties different than the one we already dequeued.

Bug: 10365313
Change-Id: I96b4b0a851920e4334ef05080d58097d46467ab8
parent 353ddc6e

services/surfaceflinger/DisplayDevice.cpp

+4 −0
Original line number Diff line number Diff line
@@ -198,6 +198,10 @@ void DisplayDevice::flip(const Region& dirty) const 
    mPageFlipCount++;

}



status_t DisplayDevice::beginFrame() const {

    return mDisplaySurface->beginFrame();

}



status_t DisplayDevice::prepareFrame(const HWComposer& hwc) const {

    DisplaySurface::CompositionType compositionType;

    bool haveGles = hwc.hasGlesComposition(mHwcDisplayId);

services/surfaceflinger/DisplayDevice.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public: 
    int32_t                 getHwcDisplayId() const { return mHwcDisplayId; }

    const wp<IBinder>&      getDisplayToken() const { return mDisplayToken; }



    status_t beginFrame() const;

    status_t prepareFrame(const HWComposer& hwc) const;



    void swapBuffers(HWComposer& hwc) const;

services/surfaceflinger/DisplayHardware/DisplaySurface.h

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ class String8; 


class DisplaySurface : public virtual RefBase {

public:

    // beginFrame is called at the beginning of the composition loop, before

    // the configuration is known. The DisplaySurface should do anything it

    // needs to do to enable HWComposer to decide how to compose the frame.

    virtual status_t beginFrame() = 0;



    // prepareFrame is called after the composition configuration is known but

    // before composition takes place. The DisplaySurface can use the

    // composition type to decide how to manage the flow of buffers between

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ FramebufferSurface::FramebufferSurface(HWComposer& hwc, int disp, 
    mConsumer->setDefaultMaxBufferCount(NUM_FRAMEBUFFER_SURFACE_BUFFERS);

}



status_t FramebufferSurface::beginFrame() {

    return NO_ERROR;

}



status_t FramebufferSurface::prepareFrame(CompositionType compositionType) {

    return NO_ERROR;

}

services/surfaceflinger/DisplayHardware/FramebufferSurface.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ class FramebufferSurface : public ConsumerBase, 
public:

    FramebufferSurface(HWComposer& hwc, int disp, const sp<IGraphicBufferConsumer>& consumer);



    virtual status_t beginFrame();

    virtual status_t prepareFrame(CompositionType compositionType);

    virtual status_t compositionComplete();

    virtual status_t advanceFrame();