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

Commit bf69c0cf authored by Aditya Kumar's avatar Aditya Kumar Committed by Gerrit Code Review
Browse files

Merge changes I31a0224a,Ib3fe4e95 into main 

* changes:
  Wreorder-init-list: Fix the order of initialization
  Implicit capture of 'this' with a capture default of '=' is deprecated
parents cf5a4f18 778b8844

libs/renderengine/skia/Cache.cpp

+24 −24
Original line number Diff line number Diff line
@@ -337,17 +337,17 @@ static void drawImageDimmedLayers(SkiaRenderEngine* renderengine, const DisplayS 
    LayerSettings layer{

            .geometry =

                    Geometry{

                            .boundaries = rect,

                            // The position transform doesn't matter when the reduced shader mode

                            // in in effect. A matrix transform stage is always included.

                            .positionTransform = mat4(),

                            .boundaries = rect,

                            .roundedCornersCrop = rect,

                            .roundedCornersRadius = {0.f, 0.f},

                            .roundedCornersCrop = rect,

                    },

            .source = PixelSource{.buffer = Buffer{.buffer = srcTexture,

                                                   .maxLuminanceNits = 1000.f,

                                                   .usePremultipliedAlpha = true,

                                                   .isOpaque = true}},

                                                   .isOpaque = true,

                                                   .maxLuminanceNits = 1000.f}},

            .alpha = 1.f,

            .sourceDataspace = kDestDataSpace,

    };
@@ -370,16 +370,16 @@ static void drawTransparentImageDimmedLayers(SkiaRenderEngine* renderengine, 
    LayerSettings layer{

            .geometry =

                    Geometry{

                            .positionTransform = mat4(),

                            .boundaries = rect,

                            .positionTransform = mat4(),

                            .roundedCornersCrop = rect,

                    },

            .source = PixelSource{.buffer =

                                          Buffer{

                                                  .buffer = srcTexture,

                                                  .maxLuminanceNits = 1000.f,

                                                  .usePremultipliedAlpha = true,

                                                  .isOpaque = false,

                                                  .maxLuminanceNits = 1000.f,

                                          }},

            .sourceDataspace = kDestDataSpace,

    };
@@ -421,17 +421,17 @@ static void drawClippedDimmedImageLayers(SkiaRenderEngine* renderengine, 
    LayerSettings layer{

            .geometry =

                    Geometry{

                            .positionTransform = mat4(),

                            .boundaries = boundary,

                            .roundedCornersCrop = rect,

                            .positionTransform = mat4(),

                            .roundedCornersRadius = {27.f, 27.f},

                            .roundedCornersCrop = rect,

                    },

            .source = PixelSource{.buffer =

                                          Buffer{

                                                  .buffer = srcTexture,

                                                  .maxLuminanceNits = 1000.f,

                                                  .usePremultipliedAlpha = true,

                                                  .isOpaque = false,

                                                  .maxLuminanceNits = 1000.f,

                                          }},

            .alpha = 1.f,

            .sourceDataspace = kDestDataSpace,
@@ -489,17 +489,17 @@ static void drawBT2020ImageLayers(SkiaRenderEngine* renderengine, const DisplayS 
    LayerSettings layer{

            .geometry =

                    Geometry{

                            .boundaries = rect,

                            // The position transform doesn't matter when the reduced shader mode

                            // in in effect. A matrix transform stage is always included.

                            .positionTransform = mat4(),

                            .boundaries = rect,

                            .roundedCornersCrop = rect,

                            .roundedCornersRadius = {0.f, 0.f},

                            .roundedCornersCrop = rect,

                    },

            .source = PixelSource{.buffer = Buffer{.buffer = srcTexture,

                                                   .maxLuminanceNits = 1000.f,

                                                   .usePremultipliedAlpha = true,

                                                   .isOpaque = true}},

                                                   .isOpaque = true,

                                                   .maxLuminanceNits = 1000.f}},

            .alpha = 1.f,

            .sourceDataspace = kBT2020DataSpace,

    };
@@ -527,17 +527,17 @@ static void drawBT2020ClippedImageLayers(SkiaRenderEngine* renderengine, 
    LayerSettings layer{

            .geometry =

                    Geometry{

                            .positionTransform = kScaleAsymmetric,

                            .boundaries = boundary,

                            .roundedCornersCrop = rect,

                            .positionTransform = kScaleAsymmetric,

                            .roundedCornersRadius = {64.1f, 64.1f},

                            .roundedCornersCrop = rect,

                    },

            .source = PixelSource{.buffer =

                                          Buffer{

                                                  .buffer = srcTexture,

                                                  .maxLuminanceNits = 1000.f,

                                                  .usePremultipliedAlpha = true,

                                                  .isOpaque = true,

                                                  .maxLuminanceNits = 1000.f,

                                          }},

            .alpha = 0.5f,

            .sourceDataspace = kBT2020DataSpace,
@@ -556,17 +556,17 @@ static void drawExtendedHDRImageLayers(SkiaRenderEngine* renderengine, 
    LayerSettings layer{

            .geometry =

                    Geometry{

                            .boundaries = rect,

                            // The position transform doesn't matter when the reduced shader mode

                            // in in effect. A matrix transform stage is always included.

                            .positionTransform = mat4(),

                            .boundaries = rect,

                            .roundedCornersCrop = rect,

                            .roundedCornersRadius = {50.f, 50.f},

                            .roundedCornersCrop = rect,

                    },

            .source = PixelSource{.buffer = Buffer{.buffer = srcTexture,

                                                   .maxLuminanceNits = 1000.f,

                                                   .usePremultipliedAlpha = true,

                                                   .isOpaque = true}},

                                                   .isOpaque = true,

                                                   .maxLuminanceNits = 1000.f}},

            .alpha = 0.5f,

            .sourceDataspace = kExtendedHdrDataSpce,

    };
@@ -594,17 +594,17 @@ static void drawP3ImageLayers(SkiaRenderEngine* renderengine, const DisplaySetti 
    LayerSettings layer{

            .geometry =

                    Geometry{

                            .boundaries = rect,

                            // The position transform doesn't matter when the reduced shader mode

                            // in in effect. A matrix transform stage is always included.

                            .positionTransform = mat4(),

                            .boundaries = rect,

                            .roundedCornersCrop = rect,

                            .roundedCornersRadius = {50.f, 50.f},

                            .roundedCornersCrop = rect,

                    },

            .source = PixelSource{.buffer = Buffer{.buffer = srcTexture,

                                                   .maxLuminanceNits = 1000.f,

                                                   .usePremultipliedAlpha = true,

                                                   .isOpaque = false}},

                                                   .isOpaque = false,

                                                   .maxLuminanceNits = 1000.f}},

            .alpha = 0.5f,

            .sourceDataspace = kOtherDataSpace,

    };

libs/renderengine/skia/debug/CaptureTimer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace skia { 


void CaptureTimer::setTimeout(TimeoutCallback function, std::chrono::milliseconds delay) {

    this->clear = false;

    CommonPool::post([=]() {

    CommonPool::post([=,this]() {

        if (this->clear) return;

        std::this_thread::sleep_for(delay);

        if (this->clear) return;