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

Commit b21d94e6 authored by Alec Mouri's avatar Alec Mouri
Browse files

Supply extra brightness parameters to RenderEngine 

A future CL will update the HLG->SDR tonemapping algorithm to consider
current display brightness, as recommended by BT2100.

In preparation for this:
* Fix an issue where maxLuminance was using the current display
brightness if supplied from DisplayManager instead of the max luminance
* Add currentDisplayBrightnessNits to the RenderEngine interface to
support the current brightness
* Plumb current display brightness all the way to libtonemap, where
nothing uses it (yet)

Bug: 206035964
Test: libcompositionengine_test

Change-Id: I3e9f0fdb23fbb08c50e4733e5a16bcd20948d750
parent d4c6a656

libs/renderengine/include/renderengine/DisplaySettings.h

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ struct DisplaySettings { 
    // Maximum luminance pulled from the display's HDR capabilities.

    float maxLuminance = 1.0f;



    // Current luminance of the display

    float currentLuminanceNits = -1.f;



    // Output dataspace that will be populated if wide color gamut is used, or

    // DataSpace::UNKNOWN otherwise.

    ui::Dataspace outputDataspace = ui::Dataspace::UNKNOWN;

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+1 −0
Original line number Diff line number Diff line
@@ -656,6 +656,7 @@ sk_sp<SkShader> SkiaGLRenderEngine::createRuntimeEffectShader( 
                                 parameters.layerDimmingRatio, 1.f));

        return createLinearEffectShader(parameters.shader, effect, runtimeEffect, colorTransform,

                                        parameters.display.maxLuminance,

                                        parameters.display.currentLuminanceNits,

                                        parameters.layer.source.buffer.maxLuminanceNits);

    }

    return parameters.shader;

libs/renderengine/skia/filters/LinearEffect.cpp

+4 −3
Original line number Diff line number Diff line
@@ -44,14 +44,15 @@ sk_sp<SkShader> createLinearEffectShader(sk_sp<SkShader> shader, 
                                         const shaders::LinearEffect& linearEffect,

                                         sk_sp<SkRuntimeEffect> runtimeEffect,

                                         const mat4& colorTransform, float maxDisplayLuminance,

                                         float maxLuminance) {

                                         float currentDisplayLuminanceNits, float maxLuminance) {

    ATRACE_CALL();

    SkRuntimeShaderBuilder effectBuilder(runtimeEffect);



    effectBuilder.child("child") = shader;



    const auto uniforms = shaders::buildLinearEffectUniforms(linearEffect, colorTransform,

                                                             maxDisplayLuminance, maxLuminance);

    const auto uniforms =

            shaders::buildLinearEffectUniforms(linearEffect, colorTransform, maxDisplayLuminance,

                                               currentDisplayLuminanceNits, maxLuminance);



    for (const auto& uniform : uniforms) {

        effectBuilder.uniform(uniform.name.c_str()).set(uniform.value.data(), uniform.value.size());

libs/renderengine/skia/filters/LinearEffect.h

+2 −1
Original line number Diff line number Diff line
@@ -37,13 +37,14 @@ sk_sp<SkRuntimeEffect> buildRuntimeEffect(const shaders::LinearEffect& linearEff 
// matrix transforming from linear XYZ to linear RGB immediately before OETF.

// We also provide additional HDR metadata upon creating the shader:

// * The max display luminance is the max luminance of the physical display in nits

// * The current luminance of the physical display in nits

// * The max luminance is provided as the max luminance for the buffer, either from the SMPTE 2086

// or as the max light level from the CTA 861.3 standard.

sk_sp<SkShader> createLinearEffectShader(sk_sp<SkShader> inputShader,

                                         const shaders::LinearEffect& linearEffect,

                                         sk_sp<SkRuntimeEffect> runtimeEffect,

                                         const mat4& colorTransform, float maxDisplayLuminance,

                                         float maxLuminance);

                                         float currentDisplayLuminanceNits, float maxLuminance);

} // namespace skia

} // namespace renderengine

} // namespace android

libs/shaders/include/shaders/shaders.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ std::string buildLinearEffectSkSL(const LinearEffect& linearEffect); 
std::vector<tonemap::ShaderUniform> buildLinearEffectUniforms(const LinearEffect& linearEffect,

                                                              const mat4& colorTransform,

                                                              float maxDisplayLuminance,

                                                              float currentDisplayLuminanceNits,

                                                              float maxLuminance);



} // namespace android::shaders