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

Commit 17637c71 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Lut] Remove output color space from lutShader. The output color space... 

Merge "[Lut] Remove output color space from lutShader. The output color space is not used. Remove it." into main
parents e6467f58 ee737f38

libs/renderengine/skia/SkiaRenderEngine.cpp

+1 −2
Original line number Diff line number Diff line
@@ -551,8 +551,7 @@ sk_sp<SkShader> SkiaRenderEngine::createRuntimeEffectShader( 


    if (graphicBuffer && parameters.layer.luts) {

        shader = mLutShader.lutShader(shader, parameters.layer.luts,

                                      parameters.layer.sourceDataspace,

                                      toSkColorSpace(parameters.outputDataSpace));

                                      parameters.layer.sourceDataspace);

    }



    if (parameters.requiresLinearEffect) {

libs/renderengine/skia/filters/LutShader.cpp

+1 −2
Original line number Diff line number Diff line
@@ -287,8 +287,7 @@ sk_sp<SkShader> LutShader::generateLutShader(sk_sp<SkShader> input, 


sk_sp<SkShader> LutShader::lutShader(sk_sp<SkShader>& input,

                                     std::shared_ptr<gui::DisplayLuts> displayLuts,

                                     ui::Dataspace srcDataspace,

                                     sk_sp<SkColorSpace> outColorSpace) {

                                     ui::Dataspace srcDataspace) {

    if (mBuilder == nullptr) {

        mBuilder = std::make_unique<SkRuntimeShaderBuilder>(mEffect);

    }

libs/renderengine/skia/filters/LutShader.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class LutShader { 
public:

    LutShader(RuntimeEffectManager& effectManager);

    sk_sp<SkShader> lutShader(sk_sp<SkShader>& input, std::shared_ptr<gui::DisplayLuts> displayLuts,

                              ui::Dataspace srcDataspace, sk_sp<SkColorSpace> outColorSpace);

                              ui::Dataspace srcDataspace);



private:

    sk_sp<SkShader> generateLutShader(sk_sp<SkShader> input, const std::vector<float>& buffers,