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

Commit 19e03347 authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

Merge "[sf] fix shadow radius propagation" into main

parents 7f02bd59 befd3e2f

services/surfaceflinger/FrontEnd/LayerSnapshotBuilder.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,7 @@ void LayerSnapshotBuilder::updateShadows(LayerSnapshot& snapshot, const Requeste 
        snapshot.shadowSettings.ambientColor *= snapshot.alpha;

        snapshot.shadowSettings.spotColor *= snapshot.alpha;

    }

    snapshot.shadowSettings.length = snapshot.shadowRadius;

}



void LayerSnapshotBuilder::updateInput(LayerSnapshot& snapshot,

services/surfaceflinger/tests/unittests/LayerHierarchyTest.h

+11 −0
Original line number Diff line number Diff line
@@ -431,6 +431,17 @@ protected: 
        mLifecycleManager.applyTransactions(transactions);

    }



    void setShadowRadius(uint32_t id, float shadowRadius) {

        std::vector<TransactionState> transactions;

        transactions.emplace_back();

        transactions.back().states.push_back({});



        transactions.back().states.front().state.what = layer_state_t::eShadowRadiusChanged;

        transactions.back().states.front().layerId = id;

        transactions.back().states.front().state.shadowRadius = shadowRadius;

        mLifecycleManager.applyTransactions(transactions);

    }



    LayerLifecycleManager mLifecycleManager;

};

services/surfaceflinger/tests/unittests/LayerSnapshotTest.cpp

+9 −0
Original line number Diff line number Diff line
@@ -853,4 +853,13 @@ TEST_F(LayerSnapshotTest, setBufferCrop) { 
    UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER);

    EXPECT_EQ(getSnapshot(1)->geomContentCrop, Rect(0, 0, 100, 100));

}



TEST_F(LayerSnapshotTest, setShadowRadius) {

    static constexpr float SHADOW_RADIUS = 123.f;

    setShadowRadius(1, SHADOW_RADIUS);

    UPDATE_AND_VERIFY(mSnapshotBuilder, STARTING_ZORDER);

    EXPECT_EQ(getSnapshot(1)->shadowSettings.length, SHADOW_RADIUS);

    EXPECT_EQ(getSnapshot(1)->shadowRadius, SHADOW_RADIUS);

}



} // namespace android::surfaceflinger::frontend