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

Commit 4c798c91 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4824048 from 3e273065 to pi-release 

Change-Id: If615f7a4ac4730f18de19ad8f4be3aafba2cb650
parents 9f8a7af9 3e273065

services/surfaceflinger/DisplayDevice.cpp

+2 −2
Original line number Diff line number Diff line
@@ -761,12 +761,12 @@ bool DisplayDevice::hasRenderIntent(RenderIntent intent) const { 
    return iter != mColorModes.end() && iter->second.renderIntent == intent;

}



bool DisplayDevice::hasModernHdrSupport(Dataspace dataspace) const {

bool DisplayDevice::hasLegacyHdrSupport(Dataspace dataspace) const {

    if ((dataspace == Dataspace::BT2020_PQ && hasHDR10Support()) ||

        (dataspace == Dataspace::BT2020_HLG && hasHLGSupport())) {

        auto iter =

                mColorModes.find(getColorModeKey(dataspace, RenderIntent::TONE_MAP_COLORIMETRIC));

        return iter != mColorModes.end() && iter->second.dataspace == dataspace;

        return iter == mColorModes.end() || iter->second.dataspace != dataspace;

    }



    return false;

services/surfaceflinger/DisplayDevice.h

+3 −3
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ public: 
    bool hasHLGSupport() const { return mHasHLG; }

    bool hasDolbyVisionSupport() const { return mHasDolbyVision; }



    // Return true if the corresponding color mode for the HDR dataspace is

    // supported.

    bool hasModernHdrSupport(ui::Dataspace dataspace) const;

    // Return true if the HDR dataspace is supported but

    // there is no corresponding color mode.

    bool hasLegacyHdrSupport(ui::Dataspace dataspace) const;



    // The returned HdrCapabilities is the combination of HDR capabilities from

    // hardware composer and RenderEngine. When the DisplayDevice supports wide

services/surfaceflinger/RenderEngine/RenderEngine.cpp

+6 −0
Original line number Diff line number Diff line
@@ -427,6 +427,12 @@ void RenderEngine::unbindNativeBufferAsFrameBuffer(RE::BindNativeBufferAsFramebu 
    // back to main framebuffer

    unbindFramebuffer(bindHelper->mTexName, bindHelper->mFbName);

    eglDestroyImageKHR(mEGLDisplay, bindHelper->mImage);



    // Workaround for b/77935566 to force the EGL driver to release the

    // screenshot buffer

    setScissor(0, 0, 0, 0);

    clearWithColor(0.0, 0.0, 0.0, 0.0);

    disableScissor();

}



// ---------------------------------------------------------------------------

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1932,9 +1932,9 @@ void SurfaceFlinger::pickColorMode(const sp<DisplayDevice>& displayDevice, 
    Dataspace hdrDataSpace;

    Dataspace bestDataSpace = getBestDataspace(displayDevice, &hdrDataSpace);



    // respect hdrDataSpace only when there is modern HDR support

    // respect hdrDataSpace only when there is no legacy HDR support

    const bool isHdr = hdrDataSpace != Dataspace::UNKNOWN &&

        displayDevice->hasModernHdrSupport(hdrDataSpace);

        !displayDevice->hasLegacyHdrSupport(hdrDataSpace);

    if (isHdr) {

        bestDataSpace = hdrDataSpace;

    }