0f46450775
This reverts commit4c412bce4c
. Reason for revert: investigating Pinpoint failure cases, if any Original change's description: > Revert "Reland "Remove inliner from IR generation stage."" > > This reverts commite497a08065
. > > Reason for revert: Pinpoint disagrees > > Original change's description: > > Reland "Remove inliner from IR generation stage." > > > > This reverts commit941fc7174f
. > > > > 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 commit21d7778cb5
. > > > > > > 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> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com Change-Id: I2727bd4a2b43e8d12b36b1979ce6fe4a2d935380 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/335936 Reviewed-by: John Stiles <johnstiles@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
83 lines
1.1 KiB
GLSL
83 lines
1.1 KiB
GLSL
|
|
out vec4 sk_FragColor;
|
|
void main() {
|
|
vec3 h3;
|
|
{
|
|
h3 = vec3(3.0);
|
|
}
|
|
|
|
vec4 h4;
|
|
{
|
|
h4 = vec4(4.0);
|
|
}
|
|
|
|
{
|
|
h3.xz = vec2(2.0);
|
|
}
|
|
|
|
{
|
|
h4.zwxy = vec4(4.0);
|
|
}
|
|
|
|
sk_FragColor = vec4(1.0, 2.0, h3.x, h4.x);
|
|
mat3 h3x3;
|
|
{
|
|
h3x3 = mat3(3.0);
|
|
}
|
|
|
|
mat4 h4x4;
|
|
{
|
|
h4x4 = mat4(4.0);
|
|
}
|
|
|
|
{
|
|
h3x3[1] = vec3(3.0);
|
|
}
|
|
|
|
{
|
|
h4x4[3].w = 1.0;
|
|
}
|
|
|
|
sk_FragColor = vec4(mat2(2.0)[0][0], h3x3[0][0], h4x4[0][0], 1.0);
|
|
ivec4 i4;
|
|
{
|
|
i4 = ivec4(4);
|
|
}
|
|
|
|
{
|
|
i4.xyz = ivec3(3);
|
|
}
|
|
|
|
sk_FragColor = vec4(1.0, 2.0, 3.0, float(i4.x));
|
|
vec3 f3;
|
|
{
|
|
f3 = vec3(3.0);
|
|
}
|
|
|
|
{
|
|
f3.xy = vec2(2.0);
|
|
}
|
|
|
|
sk_FragColor = vec4(1.0, 2.0, f3.x, 4.0);
|
|
mat2 f2x2;
|
|
{
|
|
f2x2 = mat2(2.0);
|
|
}
|
|
|
|
{
|
|
f2x2[0][0] = 1.0;
|
|
}
|
|
|
|
sk_FragColor = vec4(f2x2[0][0], mat3(3.0)[0][0], mat4(4.0)[0][0], 1.0);
|
|
bvec4 b4;
|
|
{
|
|
b4 = bvec4(false);
|
|
}
|
|
|
|
{
|
|
b4.xw = bvec2(false);
|
|
}
|
|
|
|
sk_FragColor = vec4(1.0, false ? 1.0 : 0.0, true ? 1.0 : 0.0, b4.x ? 1.0 : 0.0);
|
|
}
|