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

Commit 3aea1288 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure that LayerFECompositionState's fence is always non-null"

parents eebb584d 2b1212b9

services/surfaceflinger/CompositionEngine/include/compositionengine/LayerFECompositionState.h

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ struct LayerFECompositionState { 
    // The buffer and related state

    sp<GraphicBuffer> buffer;

    int bufferSlot{BufferQueue::INVALID_BUFFER_SLOT};

    sp<Fence> acquireFence;

    sp<Fence> acquireFence = Fence::NO_FENCE;

    Region surfaceDamage;



    // The handle to use for a sideband stream for this layer

services/surfaceflinger/CompositionEngine/tests/OutputLayerTest.cpp

+16 −0
Original line number Diff line number Diff line
@@ -1093,6 +1093,22 @@ TEST_F(OutputLayerWriteStateToHWCTest, overriddenSkipLayerDoesNotSendBuffer) { 
                                 /*zIsOverridden*/ false, /*isPeekingThrough*/ false);

}



TEST_F(OutputLayerWriteStateToHWCTest, overriddenSkipLayerForSolidColorDoesNotSendBuffer) {

    mLayerFEState.compositionType = Hwc2::IComposerClient::Composition::SOLID_COLOR;

    includeOverrideInfo();



    expectGeometryCommonCalls(kOverrideDisplayFrame, kOverrideSourceCrop, kOverrideBufferTransform,

                              kOverrideBlendMode, kSkipAlpha);

    expectPerFrameCommonCalls(SimulateUnsupported::None, kOverrideDataspace, kOverrideVisibleRegion,

                              kOverrideSurfaceDamage);

    expectSetHdrMetadataAndBufferCalls();

    expectSetCompositionTypeCall(Hwc2::IComposerClient::Composition::DEVICE);

    EXPECT_CALL(*mLayerFE, hasRoundedCorners()).WillRepeatedly(Return(false));



    mOutputLayer.writeStateToHWC(/*includeGeometry*/ true, /*skipLayer*/ true, 0,

                                 /*zIsOverridden*/ false, /*isPeekingThrough*/ false);

}



TEST_F(OutputLayerWriteStateToHWCTest, includesOverrideInfoIfPresent) {

    mLayerFEState.compositionType = Hwc2::IComposerClient::Composition::DEVICE;

    includeOverrideInfo();