Skip to content

Commit 4343b06

Browse files
appujeeandroid-build-merge-worker-robot
appujee
authored and
android-build-merge-worker-robot
committed
Merge changes I31a0224a,Ib3fe4e95 into main am: bf69c0c
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3489546 Change-Id: I8d90de9c4a37fd6727b959a664260e769583dde2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents 46f66ef + bf69c0c commit 4343b06

2 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎libs/renderengine/skia/Cache.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -337,17 +337,17 @@ static void drawImageDimmedLayers(SkiaRenderEngine* renderengine, const DisplayS
337337
LayerSettings layer{
338338
.geometry =
339339
Geometry{
340+
.boundaries = rect,
340341
// The position transform doesn't matter when the reduced shader mode
341342
// in in effect. A matrix transform stage is always included.
342343
.positionTransform = mat4(),
343-
.boundaries = rect,
344-
.roundedCornersCrop = rect,
345344
.roundedCornersRadius = {0.f, 0.f},
345+
.roundedCornersCrop = rect,
346346
},
347347
.source = PixelSource{.buffer = Buffer{.buffer = srcTexture,
348-
.maxLuminanceNits = 1000.f,
349348
.usePremultipliedAlpha = true,
350-
.isOpaque = true}},
349+
.isOpaque = true,
350+
.maxLuminanceNits = 1000.f}},
351351
.alpha = 1.f,
352352
.sourceDataspace = kDestDataSpace,
353353
};
@@ -370,16 +370,16 @@ static void drawTransparentImageDimmedLayers(SkiaRenderEngine* renderengine,
370370
LayerSettings layer{
371371
.geometry =
372372
Geometry{
373-
.positionTransform = mat4(),
374373
.boundaries = rect,
374+
.positionTransform = mat4(),
375375
.roundedCornersCrop = rect,
376376
},
377377
.source = PixelSource{.buffer =
378378
Buffer{
379379
.buffer = srcTexture,
380-
.maxLuminanceNits = 1000.f,
381380
.usePremultipliedAlpha = true,
382381
.isOpaque = false,
382+
.maxLuminanceNits = 1000.f,
383383
}},
384384
.sourceDataspace = kDestDataSpace,
385385
};
@@ -421,17 +421,17 @@ static void drawClippedDimmedImageLayers(SkiaRenderEngine* renderengine,
421421
LayerSettings layer{
422422
.geometry =
423423
Geometry{
424-
.positionTransform = mat4(),
425424
.boundaries = boundary,
426-
.roundedCornersCrop = rect,
425+
.positionTransform = mat4(),
427426
.roundedCornersRadius = {27.f, 27.f},
427+
.roundedCornersCrop = rect,
428428
},
429429
.source = PixelSource{.buffer =
430430
Buffer{
431431
.buffer = srcTexture,
432-
.maxLuminanceNits = 1000.f,
433432
.usePremultipliedAlpha = true,
434433
.isOpaque = false,
434+
.maxLuminanceNits = 1000.f,
435435
}},
436436
.alpha = 1.f,
437437
.sourceDataspace = kDestDataSpace,
@@ -489,17 +489,17 @@ static void drawBT2020ImageLayers(SkiaRenderEngine* renderengine, const DisplayS
489489
LayerSettings layer{
490490
.geometry =
491491
Geometry{
492+
.boundaries = rect,
492493
// The position transform doesn't matter when the reduced shader mode
493494
// in in effect. A matrix transform stage is always included.
494495
.positionTransform = mat4(),
495-
.boundaries = rect,
496-
.roundedCornersCrop = rect,
497496
.roundedCornersRadius = {0.f, 0.f},
497+
.roundedCornersCrop = rect,
498498
},
499499
.source = PixelSource{.buffer = Buffer{.buffer = srcTexture,
500-
.maxLuminanceNits = 1000.f,
501500
.usePremultipliedAlpha = true,
502-
.isOpaque = true}},
501+
.isOpaque = true,
502+
.maxLuminanceNits = 1000.f}},
503503
.alpha = 1.f,
504504
.sourceDataspace = kBT2020DataSpace,
505505
};
@@ -527,17 +527,17 @@ static void drawBT2020ClippedImageLayers(SkiaRenderEngine* renderengine,
527527
LayerSettings layer{
528528
.geometry =
529529
Geometry{
530-
.positionTransform = kScaleAsymmetric,
531530
.boundaries = boundary,
532-
.roundedCornersCrop = rect,
531+
.positionTransform = kScaleAsymmetric,
533532
.roundedCornersRadius = {64.1f, 64.1f},
533+
.roundedCornersCrop = rect,
534534
},
535535
.source = PixelSource{.buffer =
536536
Buffer{
537537
.buffer = srcTexture,
538-
.maxLuminanceNits = 1000.f,
539538
.usePremultipliedAlpha = true,
540539
.isOpaque = true,
540+
.maxLuminanceNits = 1000.f,
541541
}},
542542
.alpha = 0.5f,
543543
.sourceDataspace = kBT2020DataSpace,
@@ -556,17 +556,17 @@ static void drawExtendedHDRImageLayers(SkiaRenderEngine* renderengine,
556556
LayerSettings layer{
557557
.geometry =
558558
Geometry{
559+
.boundaries = rect,
559560
// The position transform doesn't matter when the reduced shader mode
560561
// in in effect. A matrix transform stage is always included.
561562
.positionTransform = mat4(),
562-
.boundaries = rect,
563-
.roundedCornersCrop = rect,
564563
.roundedCornersRadius = {50.f, 50.f},
564+
.roundedCornersCrop = rect,
565565
},
566566
.source = PixelSource{.buffer = Buffer{.buffer = srcTexture,
567-
.maxLuminanceNits = 1000.f,
568567
.usePremultipliedAlpha = true,
569-
.isOpaque = true}},
568+
.isOpaque = true,
569+
.maxLuminanceNits = 1000.f}},
570570
.alpha = 0.5f,
571571
.sourceDataspace = kExtendedHdrDataSpce,
572572
};
@@ -594,17 +594,17 @@ static void drawP3ImageLayers(SkiaRenderEngine* renderengine, const DisplaySetti
594594
LayerSettings layer{
595595
.geometry =
596596
Geometry{
597+
.boundaries = rect,
597598
// The position transform doesn't matter when the reduced shader mode
598599
// in in effect. A matrix transform stage is always included.
599600
.positionTransform = mat4(),
600-
.boundaries = rect,
601-
.roundedCornersCrop = rect,
602601
.roundedCornersRadius = {50.f, 50.f},
602+
.roundedCornersCrop = rect,
603603
},
604604
.source = PixelSource{.buffer = Buffer{.buffer = srcTexture,
605-
.maxLuminanceNits = 1000.f,
606605
.usePremultipliedAlpha = true,
607-
.isOpaque = false}},
606+
.isOpaque = false,
607+
.maxLuminanceNits = 1000.f}},
608608
.alpha = 0.5f,
609609
.sourceDataspace = kOtherDataSpace,
610610
};

‎libs/renderengine/skia/debug/CaptureTimer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace skia {
3030

3131
void CaptureTimer::setTimeout(TimeoutCallback function, std::chrono::milliseconds delay) {
3232
this->clear = false;
33-
CommonPool::post([=]() {
33+
CommonPool::post([=,this]() {
3434
if (this->clear) return;
3535
std::this_thread::sleep_for(delay);
3636
if (this->clear) return;

0 commit comments

Comments
 (0)