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

Commit 79b945cd authored by Sally Qi's avatar Sally Qi Committed by Automerger Merge Worker
Browse files

Merge "Fix SDR layer luminance increase" into tm-dev am: ba3e89d4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18170151



Change-Id: Ied8132191aaf9c67ecac8df012e165088151b3eb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 661dfb66 ba3e89d4

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -6803,7 +6803,7 @@ std::shared_future<renderengine::RenderEngineResult> SurfaceFlinger::renderScree 
                                       BlurSetting::Disabled

                                       BlurSetting::Disabled

                             : compositionengine::LayerFE::ClientCompositionTargetSettings::

                             : compositionengine::LayerFE::ClientCompositionTargetSettings::

                                       BlurSetting::Enabled,

                                       BlurSetting::Enabled,

                isHdrDataspace(dataspace) ? displayBrightnessNits : sdrWhitePointNits,

                isHdrLayer(layer) ? displayBrightnessNits : sdrWhitePointNits,





        };

        };

        std::vector<compositionengine::LayerFE::LayerSettings> results =

        std::vector<compositionengine::LayerFE::LayerSettings> results =
@@ -6818,7 +6818,7 @@ std::shared_future<renderengine::RenderEngineResult> SurfaceFlinger::renderScree 
                if (regionSampling) {

                if (regionSampling) {

                    settings.backgroundBlurRadius = 0;

                    settings.backgroundBlurRadius = 0;

                }

                }

                captureResults.capturedHdrLayers |= isHdrDataspace(settings.sourceDataspace);

                captureResults.capturedHdrLayers |= isHdrLayer(layer);

            }

            }





            clientCompositionLayers.insert(clientCompositionLayers.end(),

            clientCompositionLayers.insert(clientCompositionLayers.end(),