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

Commit f9fc9e74 authored by Sally Qi's avatar Sally Qi Committed by Android (Google) Code Review
Browse files

Merge "[Lut] in client composition, we should pass hwc.luts into lutShader to... 

Merge "[Lut] in client composition, we should pass hwc.luts into lutShader to render the layer" into main
parents a29a2d14 1ed7dec9

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

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ public: 


        // True if layers with 170M dataspace should be overridden to sRGB.

        const bool treat170mAsSrgb;



        std::shared_ptr<gui::DisplayLuts> luts;

    };



    // A superset of LayerSettings required by RenderEngine to compose a layer

services/surfaceflinger/CompositionEngine/src/Output.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1564,7 +1564,9 @@ std::vector<LayerFE::LayerSettings> Output::generateClientCompositionRequests( 
                                       .clearContent = !clientComposition,

                                       .blurSetting = blurSetting,

                                       .whitePointNits = layerState.whitePointNits,

                                       .treat170mAsSrgb = outputState.treat170mAsSrgb};

                                       .treat170mAsSrgb = outputState.treat170mAsSrgb,

                                       .luts = layer->getState().hwc ? layer->getState().hwc->luts

                                                                     : nullptr};

                if (auto clientCompositionSettings =

                            layerFE.prepareClientComposition(targetSettings)) {

                    clientCompositionLayers.push_back(std::move(*clientCompositionSettings));

services/surfaceflinger/LayerFE.cpp

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ std::optional<compositionengine::LayerFE::LayerSettings> LayerFE::prepareClientC 
    layerSettings.edgeExtensionEffect = mSnapshot->edgeExtensionEffect;

    // Record the name of the layer for debugging further down the stack.

    layerSettings.name = mSnapshot->name;

    layerSettings.luts = mSnapshot->luts;

    layerSettings.luts = mSnapshot->luts ? mSnapshot->luts : targetSettings.luts;



    if (hasEffect() && !hasBufferOrSidebandStream()) {

        prepareEffectsClientComposition(layerSettings, targetSettings);