skia2/tests/sksl/blend/golden/BlendLuminosity.metal

57 lines
2.1 KiB
Metal
Raw Normal View History

#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct Inputs {
float4 src;
float4 dst;
};
struct Outputs {
float4 sk_FragColor [[color(0)]];
};
float _blend_color_luminance(float3 color) {
return dot(float3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), color);
}
float3 _blend_set_color_luminance(float3 hueSatColor, float alpha, float3 lumColor) {
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
float _4_blend_color_luminance;
{
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
_4_blend_color_luminance = dot(float3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
}
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
float lum = _4_blend_color_luminance;
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
float _5_blend_color_luminance;
{
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
_5_blend_color_luminance = dot(float3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor);
}
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
float3 result = (lum - _5_blend_color_luminance) + hueSatColor;
float minComp = min(min(result.x, result.y), result.z);
float maxComp = max(max(result.x, result.y), result.z);
if (minComp < 0.0 && lum != minComp) {
result = lum + ((result - lum) * lum) / (lum - minComp);
}
return maxComp > alpha && maxComp != lum ? lum + ((result - lum) * (alpha - lum)) / (maxComp - lum) : result;
}
float4 blend_luminosity(float4 src, float4 dst) {
float alpha = dst.w * src.w;
float3 sda = src.xyz * dst.w;
float3 dsa = dst.xyz * src.w;
return float4((((_blend_set_color_luminance(dsa, alpha, sda) + dst.xyz) - dsa) + src.xyz) - sda, (src.w + dst.w) - alpha);
}
fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
Outputs _outputStruct;
thread Outputs* _out = &_outputStruct;
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
float4 _0_blend_luminosity;
{
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
float _1_alpha = _in.dst.w * _in.src.w;
float3 _2_sda = _in.src.xyz * _in.dst.w;
float3 _3_dsa = _in.dst.xyz * _in.src.w;
_0_blend_luminosity = float4((((_blend_set_color_luminance(_3_dsa, _1_alpha, _2_sda) + _in.dst.xyz) - _3_dsa) + _in.src.xyz) - _2_sda, (_in.src.w + _in.dst.w) - _1_alpha);
}
Revert "Reland "Remove inliner from IR generation stage."" This reverts commit e497a080651c05678cf4760fa6e4daa53a10355b. Reason for revert: Pinpoint disagrees Original change's description: > Reland "Remove inliner from IR generation stage." > > This reverts commit 941fc7174fc20e8a8b707f1b636c85bbf2e1294f. > > Reason for revert: performance now seems to be roughly equal or better > (~1%) over several trials. > Nanobench: http://screen/A8e8sojaXBgbMgF > > Original change's description: > > Revert "Remove inliner from IR generation stage." > > > > This reverts commit 21d7778cb5c13e729b513eaa22dbf53f58a877c8. > > > > Reason for revert: Pinpoint absolutely hates this change > > > > Original change's description: > > > Remove inliner from IR generation stage. > > > > > > There is no need to inline code during IR generation, as the optimizer > > > can now handle this. > > > > > > Change-Id: If272bfb98e945a75ec91fb4aa026e5631ac51b5b > > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315971 > > > Commit-Queue: John Stiles <johnstiles@google.com> > > > Commit-Queue: Brian Osman <brianosman@google.com> > > > Reviewed-by: Brian Osman <brianosman@google.com> > > > Auto-Submit: John Stiles <johnstiles@google.com> > > > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > > > Change-Id: I62c235415bcdc92a088e2a7f9c3d7dbf7e1bf669 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317976 > > Reviewed-by: John Stiles <johnstiles@google.com> > > Commit-Queue: John Stiles <johnstiles@google.com> > > TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com > > Change-Id: I6189806c678283188f4b67ee61e5886f88c2d6fc > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324891 > Reviewed-by: John Stiles <johnstiles@google.com> > Reviewed-by: Ethan Nicholas <ethannicholas@google.com> > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Auto-Submit: John Stiles <johnstiles@google.com> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I79149467565f22f53b8c28868dd53b80f3421137 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/325626 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
2020-10-13 15:19:41 +00:00
_out->sk_FragColor = _0_blend_luminosity;
return *_out;
}