skia2/tests/sksl/blend/golden/BlendSaturationStandaloneSettings.glsl

106 lines
4.6 KiB
Plaintext
Raw Normal View History

out vec4 sk_FragColor;
in vec4 src;
in vec4 dst;
float _blend_color_luminance(vec3 color) {
return dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), color);
}
vec3 _blend_set_color_luminance(vec3 hueSatColor, float alpha, vec3 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(vec3(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(vec3(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
vec3 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;
}
float _blend_color_saturation(vec3 color) {
return max(max(color.x, color.y), color.z) - min(min(color.x, color.y), color.z);
}
vec3 _blend_set_color_saturation_helper(vec3 minMidMax, float sat) {
return minMidMax.x < minMidMax.z ? vec3(0.0, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat) : vec3(0.0);
}
vec3 _blend_set_color_saturation(vec3 hueLumColor, vec3 satColor) {
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 _6_blend_color_saturation;
{
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
_6_blend_color_saturation = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
}
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 sat = _6_blend_color_saturation;
if (hueLumColor.x <= hueLumColor.y) {
if (hueLumColor.y <= hueLumColor.z) {
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
vec3 _7_blend_set_color_saturation_helper;
{
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
_7_blend_set_color_saturation_helper = hueLumColor.x < hueLumColor.z ? vec3(0.0, (sat * (hueLumColor.y - hueLumColor.x)) / (hueLumColor.z - hueLumColor.x), sat) : vec3(0.0);
}
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
hueLumColor.xyz = _7_blend_set_color_saturation_helper;
} else if (hueLumColor.x <= hueLumColor.z) {
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
vec3 _8_blend_set_color_saturation_helper;
{
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
_8_blend_set_color_saturation_helper = hueLumColor.x < hueLumColor.y ? vec3(0.0, (sat * (hueLumColor.z - hueLumColor.x)) / (hueLumColor.y - hueLumColor.x), sat) : vec3(0.0);
}
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
hueLumColor.xzy = _8_blend_set_color_saturation_helper;
} else {
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
vec3 _9_blend_set_color_saturation_helper;
{
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
_9_blend_set_color_saturation_helper = hueLumColor.z < hueLumColor.y ? vec3(0.0, (sat * (hueLumColor.x - hueLumColor.z)) / (hueLumColor.y - hueLumColor.z), sat) : vec3(0.0);
}
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
hueLumColor.zxy = _9_blend_set_color_saturation_helper;
}
} else if (hueLumColor.x <= hueLumColor.z) {
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
vec3 _10_blend_set_color_saturation_helper;
{
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
_10_blend_set_color_saturation_helper = hueLumColor.y < hueLumColor.z ? vec3(0.0, (sat * (hueLumColor.x - hueLumColor.y)) / (hueLumColor.z - hueLumColor.y), sat) : vec3(0.0);
}
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
hueLumColor.yxz = _10_blend_set_color_saturation_helper;
} else if (hueLumColor.y <= hueLumColor.z) {
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
vec3 _11_blend_set_color_saturation_helper;
{
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
_11_blend_set_color_saturation_helper = hueLumColor.y < hueLumColor.x ? vec3(0.0, (sat * (hueLumColor.z - hueLumColor.y)) / (hueLumColor.x - hueLumColor.y), sat) : vec3(0.0);
}
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
hueLumColor.yzx = _11_blend_set_color_saturation_helper;
} else {
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
vec3 _12_blend_set_color_saturation_helper;
{
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
_12_blend_set_color_saturation_helper = hueLumColor.z < hueLumColor.x ? vec3(0.0, (sat * (hueLumColor.y - hueLumColor.z)) / (hueLumColor.x - hueLumColor.z), sat) : vec3(0.0);
}
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
hueLumColor.zyx = _12_blend_set_color_saturation_helper;
}
return hueLumColor;
}
vec4 blend_saturation(vec4 src, vec4 dst) {
float alpha = dst.w * src.w;
vec3 sda = src.xyz * dst.w;
vec3 dsa = dst.xyz * src.w;
return vec4((((_blend_set_color_luminance(_blend_set_color_saturation(dsa, sda), alpha, dsa) + dst.xyz) - dsa) + src.xyz) - sda, (src.w + dst.w) - alpha);
}
void main() {
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
vec4 _0_blend_saturation;
{
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 = dst.w * src.w;
vec3 _2_sda = src.xyz * dst.w;
vec3 _3_dsa = dst.xyz * src.w;
_0_blend_saturation = vec4((((_blend_set_color_luminance(_blend_set_color_saturation(_3_dsa, _2_sda), _1_alpha, _3_dsa) + dst.xyz) - _3_dsa) + src.xyz) - _2_sda, (src.w + 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
sk_FragColor = _0_blend_saturation;
}