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

Commit 56948965 authored by Peiyong Lin's avatar Peiyong Lin Committed by Android (Google) Code Review
Browse files

Merge "[SurfaceFlinger] Use GPU composition for per layer color transform when... 

Merge "[SurfaceFlinger] Use GPU composition for per layer color transform when necessary." into qt-dev
parents 6e90aa47 04d2587f

services/surfaceflinger/BufferLayer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -321,7 +321,10 @@ void BufferLayer::setPerFrameData(const sp<const DisplayDevice>& displayDevice, 
    }



    error = hwcLayer->setColorTransform(getColorTransform());

    if (error != HWC2::Error::None) {

    if (error == HWC2::Error::Unsupported) {

        // If per layer color transform is not supported, we use GPU composition.

        setCompositionType(displayDevice, Hwc2::IComposerClient::Composition::CLIENT);

    } else if (error != HWC2::Error::None) {

        ALOGE("[%s] Failed to setColorTransform: %s (%d)", mName.string(),

                to_string(error).c_str(), static_cast<int32_t>(error));

    }

services/surfaceflinger/DisplayHardware/HWC2.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1029,9 +1029,13 @@ Error Layer::setColorTransform(const android::mat4& matrix) { 
    if (matrix == mColorMatrix) {

        return Error::None;

    }

    mColorMatrix = matrix;

    auto intError = mComposer.setLayerColorTransform(mDisplayId, mId, matrix.asArray());

    return static_cast<Error>(intError);

    Error error = static_cast<Error>(intError);

    if (error != Error::None) {

        return error;

    }

    mColorMatrix = matrix;

    return error;

}



} // namespace impl