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

Commit f13c331b authored by Alec Mouri's avatar Alec Mouri Committed by Automerger Merge Worker
Browse files

Merge "Support RenderIntents in libtonemap." into tm-dev am: e1d79721 

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



Change-Id: Iaae179a039b17d9e1c7e2ee917860375fe62d6d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a655bfe8 e1d79721

libs/renderengine/include/renderengine/DisplaySettings.h

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#pragma once



#include <aidl/android/hardware/graphics/composer3/DimmingStage.h>

#include <aidl/android/hardware/graphics/composer3/RenderIntent.h>

#include <iosfwd>



#include <math/mat4.h>
@@ -73,6 +74,10 @@ struct DisplaySettings { 
    // Configures when dimming should be applied for each layer.

    aidl::android::hardware::graphics::composer3::DimmingStage dimmingStage =

            aidl::android::hardware::graphics::composer3::DimmingStage::NONE;



    // Configures the rendering intent of the output display. This is used for tonemapping.

    aidl::android::hardware::graphics::composer3::RenderIntent renderIntent =

            aidl::android::hardware::graphics::composer3::RenderIntent::TONE_MAP_COLORIMETRIC;

};



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

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ sk_sp<SkShader> SkiaGLRenderEngine::createRuntimeEffectShader( 
                                        parameters.display.maxLuminance,

                                        parameters.display.currentLuminanceNits,

                                        parameters.layer.source.buffer.maxLuminanceNits,

                                        hardwareBuffer);

                                        hardwareBuffer, parameters.display.renderIntent);

    }

    return parameters.shader;

}

libs/renderengine/skia/filters/LinearEffect.cpp

+7 −7
Original line number Diff line number Diff line
@@ -40,12 +40,11 @@ sk_sp<SkRuntimeEffect> buildRuntimeEffect(const shaders::LinearEffect& linearEff 
    return shader;

}



sk_sp<SkShader> createLinearEffectShader(sk_sp<SkShader> shader,

                                         const shaders::LinearEffect& linearEffect,

                                         sk_sp<SkRuntimeEffect> runtimeEffect,

                                         const mat4& colorTransform, float maxDisplayLuminance,

                                         float currentDisplayLuminanceNits, float maxLuminance,

                                         AHardwareBuffer* buffer) {

sk_sp<SkShader> createLinearEffectShader(

        sk_sp<SkShader> shader, const shaders::LinearEffect& linearEffect,

        sk_sp<SkRuntimeEffect> runtimeEffect, const mat4& colorTransform, float maxDisplayLuminance,

        float currentDisplayLuminanceNits, float maxLuminance, AHardwareBuffer* buffer,

        aidl::android::hardware::graphics::composer3::RenderIntent renderIntent) {

    ATRACE_CALL();

    SkRuntimeShaderBuilder effectBuilder(runtimeEffect);
@@ -53,7 +52,8 @@ sk_sp<SkShader> createLinearEffectShader(sk_sp<SkShader> shader, 


    const auto uniforms =

            shaders::buildLinearEffectUniforms(linearEffect, colorTransform, maxDisplayLuminance,

                                               currentDisplayLuminanceNits, maxLuminance, buffer);

                                               currentDisplayLuminanceNits, maxLuminance, buffer,

                                               renderIntent);



    for (const auto& uniform : uniforms) {

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

libs/renderengine/skia/filters/LinearEffect.h

+7 −6
Original line number Diff line number Diff line
@@ -42,12 +42,13 @@ sk_sp<SkRuntimeEffect> buildRuntimeEffect(const shaders::LinearEffect& linearEff 
// or as the max light level from the CTA 861.3 standard.

// * An AHardwareBuffer for implementations that support gralloc4 metadata for

// communicating any HDR metadata.

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

                                         const shaders::LinearEffect& linearEffect,

                                         sk_sp<SkRuntimeEffect> runtimeEffect,

                                         const mat4& colorTransform, float maxDisplayLuminance,

                                         float currentDisplayLuminanceNits, float maxLuminance,

                                         AHardwareBuffer* buffer);

// * A RenderIntent that communicates the downstream renderintent for a physical display, for image

// quality compensation.

sk_sp<SkShader> createLinearEffectShader(

        sk_sp<SkShader> inputShader, const shaders::LinearEffect& linearEffect,

        sk_sp<SkRuntimeEffect> runtimeEffect, const mat4& colorTransform, float maxDisplayLuminance,

        float currentDisplayLuminanceNits, float maxLuminance, AHardwareBuffer* buffer,

        aidl::android::hardware::graphics::composer3::RenderIntent renderIntent);

} // namespace skia

} // namespace renderengine

} // namespace android

libs/shaders/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cc_library_static { 


    shared_libs: [

        "android.hardware.graphics.common-V3-ndk",

        "android.hardware.graphics.composer3-V1-ndk",

        "android.hardware.graphics.common@1.2",

        "libnativewindow",

    ],