d68069019b
Previously, any code which emitted a binary expression would always emit a leading and trailing space. This caused comma expressions to look goofy: `foo() , bar();` instead of `foo(), bar();`. Operator::operatorName() now returns the operator token with appropriate whitespace around it, and tightOperatorName() is a new method which omits the whitespace. Functions which assemble binary expressions should now concatenate `x + operatorName() + y` instead of hard-coding `x + " " + operatorName() + " " + y`. Prefix/postfix expressions should use `tightOperatorName()` because otherwise negation looks bad (` - 123` instead of `-123`). Super low priority, but it was easy to fix. Change-Id: I3c92832207293a310fb1070b3b5e72455757b0ce Reviewed-on: https://skia-review.googlesource.com/c/skia/+/497776 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: John Stiles <johnstiles@google.com> Auto-Submit: John Stiles <johnstiles@google.com>
9 lines
304 B
GLSL
9 lines
304 B
GLSL
|
|
out vec4 sk_FragColor;
|
|
uniform mat4 colorXform;
|
|
layout (binding = 0) uniform sampler2D s;
|
|
void main() {
|
|
vec4 tmpColor;
|
|
sk_FragColor = (tmpColor = texture(s, vec2(1.0)), colorXform != mat4(1.0) ? vec4(clamp((colorXform * vec4(tmpColor.xyz, 1.0)).xyz, 0.0, tmpColor.w), tmpColor.w) : tmpColor);
|
|
}
|