John Stiles dd7783f4ce Remove accidentally-commited conflict markers. ... Change-Id: Ifc1f0921d983ee09d7bc2632aeca41689f1bf0c3 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/338603 Commit-Queue: John Stiles <johnstiles@google.com> Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: John Stiles <johnstiles@google.com> Reviewed-by: Brian Osman <brianosman@google.com>		2020-11-25 19:36:21 +00:00
..
blend	Reland "Simplify _blend_set_color_saturation, removing an instruction."	2020-11-24 15:35:05 +00:00
errors	Disallow unary minus on boolean vectors.	2020-11-25 17:02:27 +00:00
fp	Reland "Remove inliner from IR generation stage."	2020-11-20 18:44:07 +00:00
glsl	Add golden outputs for the Metal backend.	2020-09-25 17:46:43 +00:00
inliner	Reland "Simplify _blend_set_color_saturation, removing an instruction."	2020-11-24 15:35:05 +00:00
metal	Flatten out constructors nested inside constructors.	2020-11-23 21:29:53 +00:00
shared	Remove accidentally-commited conflict markers.	2020-11-25 19:36:21 +00:00
workarounds	Avoid inlining functions that are called repeatedly.	2020-11-23 21:51:43 +00:00