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

Commit e3926ada authored by John Reck's avatar John Reck Committed by Automerger Merge Worker
Browse files

Merge "Make sdr white point do a thing" into sc-dev am: 18c79705 

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

Change-Id: I95afcc5f5ce673933475b99f0b6f8ffa1c1c492c
parents e3784732 18c79705

libs/renderengine/gl/GLESRenderEngine.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1233,8 +1233,10 @@ status_t GLESRenderEngine::drawLayers(const DisplaySettings& display, 
            }

        }



        mState.maxMasteringLuminance = layer->source.buffer.maxMasteringLuminance;

        mState.maxContentLuminance = layer->source.buffer.maxContentLuminance;

        // Ensure luminance is at least 100 nits to avoid div-by-zero

        const float maxLuminance = std::max(100.f, layer->source.buffer.maxLuminanceNits);

        mState.maxMasteringLuminance = maxLuminance;

        mState.maxContentLuminance = maxLuminance;

        mState.projectionMatrix = projectionMatrix * layer->geometry.positionTransform;



        const FloatRect bounds = layer->geometry.boundaries;

libs/renderengine/include/renderengine/DisplaySettings.h

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,9 @@ struct DisplaySettings { 
    // capture of a device in landscape while the buffer is in portrait

    // orientation.

    uint32_t orientation = ui::Transform::ROT_0;



    // SDR white point, -1f if unknown

    float sdrWhitePointNits = -1.f;

};



static inline bool operator==(const DisplaySettings& lhs, const DisplaySettings& rhs) {

libs/renderengine/include/renderengine/LayerSettings.h

+4 −6
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ struct Buffer { 


    // HDR color-space setting for Y410.

    bool isY410BT2020 = false;

    float maxMasteringLuminance = 0.0;

    float maxContentLuminance = 0.0;



    float maxLuminanceNits = 0.0;

};



// Metadata describing the layer geometry.
@@ -175,8 +175,7 @@ static inline bool operator==(const Buffer& lhs, const Buffer& rhs) { 
            lhs.textureTransform == rhs.textureTransform &&

            lhs.usePremultipliedAlpha == rhs.usePremultipliedAlpha &&

            lhs.isOpaque == rhs.isOpaque && lhs.isY410BT2020 == rhs.isY410BT2020 &&

            lhs.maxMasteringLuminance == rhs.maxMasteringLuminance &&

            lhs.maxContentLuminance == rhs.maxContentLuminance;

            lhs.maxLuminanceNits == rhs.maxLuminanceNits;

}



static inline bool operator==(const Geometry& lhs, const Geometry& rhs) {
@@ -239,8 +238,7 @@ static inline void PrintTo(const Buffer& settings, ::std::ostream* os) { 
    *os << "\n    .usePremultipliedAlpha = " << settings.usePremultipliedAlpha;

    *os << "\n    .isOpaque = " << settings.isOpaque;

    *os << "\n    .isY410BT2020 = " << settings.isY410BT2020;

    *os << "\n    .maxMasteringLuminance = " << settings.maxMasteringLuminance;

    *os << "\n    .maxContentLuminance = " << settings.maxContentLuminance;

    *os << "\n    .maxLuminanceNits = " << settings.maxLuminanceNits;

    *os << "\n}";

}

libs/renderengine/skia/Cache.cpp

+2 −4
Original line number Diff line number Diff line
@@ -108,8 +108,7 @@ static void drawImageLayers(SkiaRenderEngine* renderengine, const DisplaySetting 
            .source = PixelSource{.buffer =

                                          Buffer{

                                                  .buffer = srcTexture,

                                                  .maxMasteringLuminance = 1000.f,

                                                  .maxContentLuminance = 1000.f,

                                                  .maxLuminanceNits = 1000.f,

                                          }},

    };
@@ -205,8 +204,7 @@ static void drawTextureScaleLayers(SkiaRenderEngine* renderengine, const Display 
            .source = PixelSource{.buffer =

                                          Buffer{

                                                  .buffer = srcTexture,

                                                  .maxMasteringLuminance = 1000.f,

                                                  .maxContentLuminance = 1000.f,

                                                  .maxLuminanceNits = 1000.f,

                                                  .textureTransform = kScaleYOnly,

                                          }},

            .sourceDataspace = kOtherDataSpace,

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+10 −4
Original line number Diff line number Diff line
@@ -590,10 +590,14 @@ sk_sp<SkShader> SkiaGLRenderEngine::createRuntimeEffectShader( 
        } else {

            runtimeEffect = effectIter->second;

        }

        float maxLuminance = layer->source.buffer.maxLuminanceNits;

        // If the buffer doesn't have a max luminance, treat it as SDR & use the display's SDR

        // white point

        if (maxLuminance <= 0.f) {

            maxLuminance = display.sdrWhitePointNits;

        }

        return createLinearEffectShader(shader, effect, runtimeEffect, layer->colorTransform,

                                        display.maxLuminance,

                                        layer->source.buffer.maxMasteringLuminance,

                                        layer->source.buffer.maxContentLuminance);

                                        display.maxLuminance, maxLuminance);

    }

    return shader;

}
@@ -904,7 +908,9 @@ status_t SkiaGLRenderEngine::drawLayers(const DisplaySettings& display, 


        const bool requiresLinearEffect = layer->colorTransform != mat4() ||

                (mUseColorManagement &&

                 needsToneMapping(layer->sourceDataspace, display.outputDataspace));

                 needsToneMapping(layer->sourceDataspace, display.outputDataspace)) ||

                (display.sdrWhitePointNits > 0.f &&

                 display.sdrWhitePointNits != display.maxLuminance);



        // quick abort from drawing the remaining portion of the layer

        if (layer->alpha == 0 && !requiresLinearEffect && !layer->disableBlending &&